diff --git a/module/TAMU/config/module.config.php b/module/TAMU/config/module.config.php index b26ed0c77e3..87e55bb13a0 100644 --- a/module/TAMU/config/module.config.php +++ b/module/TAMU/config/module.config.php @@ -1,17 +1,39 @@ [ - 'plugin_managers' => [ - 'ils_driver' => [ - 'factories' => [ - 'TAMU\\ILS\\Driver\\Folio' => 'VuFind\\ILS\\Driver\\FolioFactory', - ], - 'aliases' => [ - 'VuFind\\ILS\\Driver\\Folio' => 'TAMU\\ILS\\Driver\\Folio', - ] - ], - ], - ], -]; +return array ( + 'vufind' => + array ( + 'plugin_managers' => + array ( + 'ils_driver' => + array ( + 'factories' => + array ( + 'TAMU\\ILS\\Driver\\Folio' => 'VuFind\\ILS\\Driver\\FolioFactory', + ), + 'aliases' => + array ( + 'VuFind\\ILS\\Driver\\Folio' => 'TAMU\\ILS\\Driver\\Folio', + ), + ), + 'recorddriver' => + array ( + 'factories' => + array ( + 'TAMU\\RecordDriver\\SolrMarc' => 'TAMU\\RecordDriver\\SolrDefaultFactory', + ), + 'aliases' => + array ( + 'VuFind\\RecordDriver\\SolrMarc' => 'TAMU\\RecordDriver\\SolrMarc', + ), + 'delegators' => + array ( + 'TAMU\\RecordDriver\\SolrMarc' => + array ( + 0 => 'TAMU\\RecordDriver\\IlsAwareDelegatorFactory', + ), + ), + ), + ), + ), +); \ No newline at end of file diff --git a/module/TAMU/src/TAMU/RecordDriver/DefaultRecord.php b/module/TAMU/src/TAMU/RecordDriver/DefaultRecord.php index 899a2f2b8ee..4374ff05685 100644 --- a/module/TAMU/src/TAMU/RecordDriver/DefaultRecord.php +++ b/module/TAMU/src/TAMU/RecordDriver/DefaultRecord.php @@ -40,13 +40,5 @@ */ class DefaultRecord extends \VuFind\RecordDriver\DefaultRecord { - /** - * Get an array of all the language notes associated with the record. - * - * @return array - */ - public function getLanguageNote() - { - return (array)($this->fields['language-notes'] ?? []); - } + } diff --git a/module/TAMU/src/TAMU/RecordDriver/IlsAwareDelegatorFactory.php b/module/TAMU/src/TAMU/RecordDriver/IlsAwareDelegatorFactory.php new file mode 100644 index 00000000000..b4bed9d3653 --- /dev/null +++ b/module/TAMU/src/TAMU/RecordDriver/IlsAwareDelegatorFactory.php @@ -0,0 +1,8 @@ +fields['uniform_title_str_mv'] ?? []; + } + + /** + * Get an array of all the language notes associated with the record. + * + * @return array + */ + public function getLanguageNotes() + { + return (array)($this->fields['language-notes'] ?? []); + } +} diff --git a/module/TAMU/src/TAMU/View/Helper/Root/RecordDataFormatterFactory.php b/module/TAMU/src/TAMU/View/Helper/Root/RecordDataFormatterFactory.php index 4db70020844..a58267c2d8a 100644 --- a/module/TAMU/src/TAMU/View/Helper/Root/RecordDataFormatterFactory.php +++ b/module/TAMU/src/TAMU/View/Helper/Root/RecordDataFormatterFactory.php @@ -68,6 +68,10 @@ public function getDefaultCoreSpecs() null, ['recordLink' => 'title'] ); + $spec->setLine( + 'Uniform Title', + 'getUniformTitle' + ); $spec->setMultiLine( 'Authors', 'getDeduplicatedAuthors', @@ -89,7 +93,7 @@ public function getDefaultCoreSpecs() ); $spec->setLine( 'Language Notes', - 'getLanguageNote', + 'getLanguageNotes', null, ['itemPrefix' => '', 'itemSuffix' => ''] diff --git a/module/VuFind/src/VuFind/RecordDriver/DefaultRecord.php b/module/VuFind/src/VuFind/RecordDriver/DefaultRecord.php index 5a68db1393c..d7ad6fecd6c 100644 --- a/module/VuFind/src/VuFind/RecordDriver/DefaultRecord.php +++ b/module/VuFind/src/VuFind/RecordDriver/DefaultRecord.php @@ -652,6 +652,14 @@ public function getLanguages() return (array)($this->fields['language'] ?? []); } + /** + * Get the uniform title from the 130a field + */ + public function getUniformTitle() + { + return $this->fields['uniform_title_str_mv'] ?? []; + } + /** * Get a raw, unnormalized LCCN. (See getLCCN for normalization). * diff --git a/themes/TAMU/templates/ContentBlock/FacetList.phtml b/themes/TAMU/templates/ContentBlock/FacetList.phtml index e06079a9040..ed0f817508f 100644 --- a/themes/TAMU/templates/ContentBlock/FacetList.phtml +++ b/themes/TAMU/templates/ContentBlock/FacetList.phtml @@ -43,6 +43,10 @@ Policy Sciences and Economics Library +
=$this->transEsc('An error has occurred')?>
+=$this->transEsc($this->message)?>
+
+ =$this->transEsc('Please contact AskUs for assistance')?>
+
+ escapeHtmlAttr($this->systemEmail()); ?>
+ =$supportEmail?>
+
+ =$this->transEsc('Message')?>: =$this->escapeHtml($this->exception->getMessage())?> +
+ +=$this->exception->getTraceAsString()?> ++ + exception->getPrevious()): ?> +
=$e->getMessage()?>
+=$e->getTraceAsString()?>+ getPrevious(); ?> + + + + request)): ?> +
=$this->escapeHtml(var_export($this->request->getParams(), true))?>+ + diff --git a/themes/TAMU/templates/error/loginForAccess.phtml b/themes/TAMU/templates/error/loginForAccess.phtml new file mode 100644 index 00000000000..3e90cee9614 --- /dev/null +++ b/themes/TAMU/templates/error/loginForAccess.phtml @@ -0,0 +1,4 @@ + + + =$this->transEsc('Login for full access')?> + diff --git a/themes/TAMU/templates/error/permissiondenied.phtml b/themes/TAMU/templates/error/permissiondenied.phtml new file mode 100644 index 00000000000..6280b9882a8 --- /dev/null +++ b/themes/TAMU/templates/error/permissiondenied.phtml @@ -0,0 +1,25 @@ +headTitle($this->translate('permission_denied_title')); + + // Disable top search box -- this page has a special layout. + $this->layout()->searchbox = false; + + $this->layout()->breadcrumbs = '
=$this->flashmessages()?>
++ =$this->transEsc('permission_denied')?> + +
+ =$this->transEsc('Please contact AskUs for assistance')?>
+
+ escapeHtmlAttr($this->systemEmail()); ?>
+ =$supportEmail?>
+
+ =$this->transEsc('The system is currently unavailable due to system maintenance')?>. + =$this->transEsc('Please check back soon')?>. +
+
+ =$this->transEsc('Please contact AskUs for assistance')?>
+
+ escapeHtmlAttr($this->systemEmail()); ?>
+ =$supportEmail?>
+