fix for #469 and codestyle fixes

swissbib · Dec 19, 2016 · 947879f · 947879f
1 parent 7f244ae
commit 947879f
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/module/Swissbib/src/Swissbib/RecordDriver/SolrMarc.php b/module/Swissbib/src/Swissbib/RecordDriver/SolrMarc.php
@@ -1801,7 +1801,13 @@ public function getNationalLicenceData()
         //gives always the same publisher in result list
         //$publisher = array_values($this->getHoldingsStructure())[0]['institution'];
 
-        $publisher = $this->getFieldArray('035', ['a'])[0];
+        $publisherArray = $this->getFieldArray('035', ['a']);
+        $publisher = "";
+        foreach ($publisherArray as $key => $val) {
+            if (strpos($key, '(NATIONALLICENCE)') !== 0) {
+                $publisher = $val;
+            }
+        }
         $publisher = explode("-", $publisher)[0];
         $publisher = str_replace("(NATIONALLICENCE)", "NL-", $publisher);
 

diff --git a/module/Swissbib/src/Swissbib/View/Helper/NationalLicences.php b/module/Swissbib/src/Swissbib/View/Helper/NationalLicences.php
@@ -66,7 +66,7 @@ class NationalLicences extends AbstractHelper
      *
      * @param $sm HelperPluginManager
      */
-    public function __construct($sm)
+    public function __construct(ServiceManager $sm)
     {
         $this->sm = $sm;
         $this->config = $sm->getServiceLocator()->get('VuFind\Config')
@@ -86,7 +86,7 @@ public function __construct($sm)
         );
         $this->remoteAddress->setTrustedProxies($trustedProxies);
         $this->nationalLicenceService = $this->sm->getServiceLocator()
-            ->get('Swissbib\NationalLicenceService');
+                ->get('Swissbib\NationalLicenceService');
 
         /*
         Based on Oxford mapping: