diff --git a/module/finc/src/finc/View/Helper/Root/RecordDataFormatterFactory.php b/module/finc/src/finc/View/Helper/Root/RecordDataFormatterFactory.php index 031a26996d6b7b5f95ce3c43066ae7f2448e4d00..176918827685f039bf43f0c0f030f609dc4c8d96 100644 --- a/module/finc/src/finc/View/Helper/Root/RecordDataFormatterFactory.php +++ b/module/finc/src/finc/View/Helper/Root/RecordDataFormatterFactory.php @@ -114,7 +114,7 @@ class RecordDataFormatterFactory ['helperMethod' => 'getFormatList'] ); $spec->setTemplateLine( - 'Language', 'getLanguages', 'data-transEscCommaSep.phtml' + 'Language', 'getLanguages', 'data-transEscCommaSepLang.phtml' ); $spec->setTemplateLine( 'Published', @@ -214,7 +214,7 @@ class RecordDataFormatterFactory ['helperMethod' => 'getFormatList'] ); $spec->setTemplateLine( - 'Language', 'getLanguages', 'data-transEscCommaSep.phtml' + 'Language', 'getLanguages', 'data-transEscCommaSepLang.phtml' ); $spec->setTemplateLine( 'Additionals', @@ -250,7 +250,7 @@ class RecordDataFormatterFactory ] ); $spec->setTemplateLine( - 'Language', 'getLanguages', 'data-transEscCommaSep.phtml' + 'Language', 'getLanguages', 'data-transEscCommaSepLang.phtml' ); $spec->setLine( 'Format', 'getFormats', 'RecordHelper', @@ -316,7 +316,7 @@ class RecordDataFormatterFactory ['helperMethod' => 'getFormatList'] ); $spec->setTemplateLine( - 'Language', 'getLanguages', 'data-transEscCommaSep.phtml' + 'Language', 'getLanguages', 'data-transEscCommaSepLang.phtml' ); $spec->setTemplateLine( 'Published', @@ -609,7 +609,7 @@ class RecordDataFormatterFactory ); // , context: "recordEvents" $spec->setTemplateLine( - 'Language', 'getLanguages','data-transEscCommaSep.phtml' + 'Language', 'getLanguages','data-transEscCommaSepLang.phtml' ); $spec->setTemplateLine( 'Time of origin', 'getDateSpan', 'data-dateSpan.phtml' @@ -701,7 +701,7 @@ class RecordDataFormatterFactory ['helperMethod' => 'getFormatList'] ); $spec->setTemplateLine( - 'Language', 'getLanguages', 'data-transEscCommaSep.phtml' + 'Language', 'getLanguages', 'data-transEscCommaSepLang.phtml' ); $spec->setTemplateLine( 'Published', diff --git a/themes/finc/templates/RecordDriver/SolrAI/core.phtml b/themes/finc/templates/RecordDriver/SolrAI/core.phtml index ae088dc6da92c2182c77ee251b2986ca6e0ef2be..2828594c460282cc9771ead438aff4f2c1e0fa40 100644 --- a/themes/finc/templates/RecordDriver/SolrAI/core.phtml +++ b/themes/finc/templates/RecordDriver/SolrAI/core.phtml @@ -1,6 +1,6 @@ <!-- finc: recordDriver - solrAI - CORE --> <? /* Created in 4826, based on SolrDefault - core, compare with SolrDefault - core during updates! */ ?> -<div class="row" vocab="http://schema.org/" resource="#record" typeof="<?=$this->driver->getSchemaOrgFormats()?> Product"> +<div class="media" vocab="http://schema.org/" resource="#record" typeof="<?=$this->driver->getSchemaOrgFormats()?> Product"> <? $QRCode = $this->record($this->driver)->getQRCode("core"); $coverDetails = $this->record($this->driver)->getCoverDetails('core', 'medium', $this->record($this->driver)->getThumbnail('large')); @@ -42,7 +42,8 @@ remove schema name tag here but keep in description, CK */ ?> - <h3><?=$this->escapeHtml(preg_replace('/(\s[\/\.:]\s*)*$/', '', $this->truncate($this->driver->getShortTitle() . ' ' . $this->driver->getSubtitle() . ' ' . $this->driver->getTitleSection(), 100)))?></h3> + <? /* finc: add schema tags for title #13850 - VE */ ?> + <h3 property="name"><?=$this->escapeHtml(preg_replace('/(\s[\/\.:]\s*)*$/', '', $this->truncate($this->driver->getShortTitle() . ' ' . $this->driver->getSubtitle() . ' ' . $this->driver->getTitleSection(), 100)))?></h3> <? $summary = $this->driver->getSummary(); $summary = isset($summary[0]) ? $this->escapeHtml($summary[0]) : false; ?> <? if ($summary): ?> diff --git a/themes/finc/templates/RecordDriver/SolrAI/data-jTitle.phtml b/themes/finc/templates/RecordDriver/SolrAI/data-jTitle.phtml index e2e396541254f12726902c33b09f3befca870c5a..f11fe9a36717fc89b40b229d63eb1b5821a5cffd 100644 --- a/themes/finc/templates/RecordDriver/SolrAI/data-jTitle.phtml +++ b/themes/finc/templates/RecordDriver/SolrAI/data-jTitle.phtml @@ -26,5 +26,10 @@ } } ?> -<?=implode(', ', $jtitle)?> +<? /* finc: add schema tags for parent publication #13850 - VE */ ?> +<span property="isPartOf" typeof="Periodical" resource="#periodical"> + <span property="name"> + <?=implode(', ', $jtitle)?> + </span> +</span> <!-- finc: RecordDriver - SolrAi - data-jTitle - END --> \ No newline at end of file diff --git a/themes/finc/templates/RecordDriver/SolrDefault/core.phtml b/themes/finc/templates/RecordDriver/SolrDefault/core.phtml index 961f931ef871b69a2af9d12c4fe1f95d05a4dfbf..48462c26c31e8798eb152a81a40f36227533cac8 100644 --- a/themes/finc/templates/RecordDriver/SolrDefault/core.phtml +++ b/themes/finc/templates/RecordDriver/SolrDefault/core.phtml @@ -41,7 +41,8 @@ remove schema name tag here but keept in description, CK */ ?> - <h3><?=$this->escapeHtml(preg_replace('/(\s[\/\.:]\s*)*$/', '', $this->truncate($this->driver->getShortTitle() . ' ' . $this->driver->getSubtitle() . ' ' . $this->driver->getTitleSection(), 100)))?></h3> + <? /* finc: add schema tags for title #13850 - VE */ ?> + <h3 property="name"><?=$this->escapeHtml(preg_replace('/(\s[\/\.:]\s*)*$/', '', $this->truncate($this->driver->getShortTitle() . ' ' . $this->driver->getSubtitle() . ' ' . $this->driver->getTitleSection(), 100)))?></h3> <? $summary = $this->driver->getSummary(); $summary = isset($summary[0]) ? $this->escapeHtml($summary[0]) : false; ?> <? if ($summary): ?> diff --git a/themes/finc/templates/RecordDriver/SolrDefault/data-titleDetails.phtml b/themes/finc/templates/RecordDriver/SolrDefault/data-titleDetails.phtml index c903481e56b98d5b47a1325da919e01c05f95c04..fc6b44e32028396be96662c9529079bff87adae0 100644 --- a/themes/finc/templates/RecordDriver/SolrDefault/data-titleDetails.phtml +++ b/themes/finc/templates/RecordDriver/SolrDefault/data-titleDetails.phtml @@ -1,5 +1,4 @@ <!-- finc: RecordDriver - solrDefault - data-titleDetails --> -<span property="name"> <? if (!empty($data)): ?> <? $i = 0; foreach ($data as $title): ?> <?=($i > 0 ? '<br />':'')?><?=$this->escapeHtml($title)?><? $i++ ;?> @@ -12,5 +11,4 @@ . ($this->driver->getTitleStatement() ? ' / ' . $this->driver->getTitleStatement() : '')?><br /><?=($this->driver->tryMethod('getTitleOrig') && $this->driver->getTitleOrig() != '' ? $this->escapeHtml($this->driver->getTitleOrig()) : '') ?> <? endif; ?> -</span> <!-- finc: RecordDriver - solrDefault - data-titleDetails - END --> diff --git a/themes/finc/templates/RecordDriver/SolrDefault/data-transEscCommaSepLang.phtml b/themes/finc/templates/RecordDriver/SolrDefault/data-transEscCommaSepLang.phtml new file mode 100644 index 0000000000000000000000000000000000000000..ce46d2e8a4622ac10b090048ef33d59bb688a68a --- /dev/null +++ b/themes/finc/templates/RecordDriver/SolrDefault/data-transEscCommaSepLang.phtml @@ -0,0 +1,12 @@ +<!-- finc: RecordDriver - solrDefault - data-transEscCommaSepLang --> +<?if (!empty($data)): ?> + <? if(is_array($data)): ?> + <? /* finc: add schema tags for language #13850 - VE */ ?> + <span property="inLanguage"> + <?=implode('</span>, <span property="inLanguage">', array_map(array($this, 'transEsc'), $data)); ?> + </span> + <? else: ?> + <?= $this->transEsc($data) ?> + <? endif; ?> +<? endif; ?> +<!-- finc: RecordDriver - solrDefault - data-transEscCommaSepLang - END --> diff --git a/themes/finc/templates/RecordDriver/SolrMarc/core.phtml b/themes/finc/templates/RecordDriver/SolrMarc/core.phtml index 6be3f73ba42e07abef1cd5b399411c229c8ea08b..bbb181fc9bb795c37b2525caf062436059d6d643 100644 --- a/themes/finc/templates/RecordDriver/SolrMarc/core.phtml +++ b/themes/finc/templates/RecordDriver/SolrMarc/core.phtml @@ -41,7 +41,8 @@ remove schema name tag here but keept in description, CK */ ?> - <h3><?=$this->escapeHtml(preg_replace('/(\s[\/\.:]\s*)*$/', '', $this->truncate($this->driver->getShortTitle() . ' ' . $this->driver->getSubtitle() . ' ' . $this->driver->getTitleSection(), 100)))?></h3> + <? /* finc: add schema tags for title #13850 - VE */ ?> + <h3 property="name"><?=$this->escapeHtml(preg_replace('/(\s[\/\.:]\s*)*$/', '', $this->truncate($this->driver->getShortTitle() . ' ' . $this->driver->getSubtitle() . ' ' . $this->driver->getTitleSection(), 100)))?></h3> <? $summary = $this->driver->getSummary(); $summary = isset($summary[0]) ? $this->escapeHtml($summary[0]) : false; ?> <? if ($summary): ?> diff --git a/themes/finc/templates/RecordTab/holdingsils.phtml b/themes/finc/templates/RecordTab/holdingsils.phtml index f17b7b966cb12857e967b6ce40211b03cfaad74d..42faaa8d2611ffd83a66bf2b9e287bacc103f890 100644 --- a/themes/finc/templates/RecordTab/holdingsils.phtml +++ b/themes/finc/templates/RecordTab/holdingsils.phtml @@ -173,7 +173,7 @@ if (!empty($holdingTitleHold)): ?> <? endif; ?> <? /* Embed item structured data: library, barcode, call number */ ?> <? if ($row['location']): ?> - <meta property="seller" content="<?=$this->escapeHtmlAttr($row['location'])?>"/> + <meta property="offeredBy" content="<?=$this->escapeHtmlAttr($row['location'])?>"/> <? endif; ?> <? if ($row['barcode']): ?> <meta property="serialNumber" content="<?=$this->escapeHtmlAttr($row['barcode'])?>"/> @@ -182,8 +182,10 @@ if (!empty($holdingTitleHold)): ?> <meta property="sku" content="<?=$this->escapeHtmlAttr($row['callnumber'])?>"/> <? endif; ?> <? /* Declare that the item is to be borrowed, not for sale */ ?> - <link property="businessFunction" href="http://purl.org/goodrelations/v1#LeaseOut"/> <link property="itemOffered" href="#record"/> + <!-- finc: price tags can be anywhere but seem to be required for product --> + <meta property="price" content="0"> + <meta property="priceCurrency" content="€"> </td> <? /* finc: change separate <tr>-element to <td> with including <span> #13606 - VE */ ?>