[FINNA-1243] Add method to SolrMarc.php instead of SolrFinnaTrait.php

tmikkonen · Apr 9, 2024 · 48526f9 · 48526f9
1 parent 34e282e
commit 48526f9
Show file tree

Hide file tree

Showing 2 changed files with 35 additions and 26 deletions.
diff --git a/module/Finna/src/Finna/RecordDriver/Feature/SolrFinnaTrait.php b/module/Finna/src/Finna/RecordDriver/Feature/SolrFinnaTrait.php
@@ -30,7 +30,6 @@
 
 namespace Finna\RecordDriver\Feature;
 
-use Vufind\RecordDriver\Feature\MarcReaderTrait;
 use VuFind\RecordDriver\Feature\VersionAwareInterface;
 use VuFindSearch\Command\RetrieveCommand;
 use VuFindSearch\Command\SearchCommand;
@@ -579,31 +578,7 @@ public function getOrganisationInfoId()
      */
     public function getOriginalLanguages()
     {
-        $languages = array_unique(array_filter(array_merge(
-            // 041h - language code of original
-            $this->getFieldArray('041', ['h'], false, true, true),
-            // 979i - component part original language
-            $this->getFieldArray('979', ['i'], false, true, true)
-        )));
-        if (!empty($languages)) {
-            foreach ($this->getMarcReader()->getFields('041') as $field) {
-                if ($field['i1'] != 0) {
-                    $sortingArr = [];
-                    foreach ($this->getLanguages() as $lang) {
-                        $sortingArr[] = $lang;
-                    }
-                    uasort($languages, function ($a, $b) use ($sortingArr) {
-                        return array_search($a, $sortingArr) <=> array_search($b, $sortingArr);
-                    });
-                }
-            }
-        } else {
-            $result = [];
-        }
-        if (!isset($result)) {
-            $result = $languages;
-        }
-        return $result;
+        return $this->fields['original_lng_str_mv'] ?? [];
     }
 
     /**

diff --git a/module/Finna/src/Finna/RecordDriver/SolrMarc.php b/module/Finna/src/Finna/RecordDriver/SolrMarc.php
@@ -2541,4 +2541,38 @@ public function getAbstractLanguage()
     {
         return $this->stripTrailingPunctuation($this->getFieldArray('041', ['b']));
     }
+
+    /**
+     * Get original languages from fields 041, subfield h and 979, subfield i
+     *
+     * @return array
+     */
+    public function getOriginalLanguages()
+    {
+        $languages = array_unique(array_filter(array_merge(
+            // 041h - language code of original
+            $this->getFieldArray('041', ['h'], false, true, true),
+            // 979i - component part original language
+            $this->getFieldArray('979', ['i'], false, true, true)
+        )));
+        if (!empty($languages)) {
+            foreach ($this->getMarcReader()->getFields('041') as $field) {
+                if ($field['i1'] != 0) {
+                    $sortingArr = [];
+                    foreach ($this->getLanguages() as $lang) {
+                        $sortingArr[] = $lang;
+                    }
+                    uasort($languages, function ($a, $b) use ($sortingArr) {
+                        return array_search($a, $sortingArr) <=> array_search($b, $sortingArr);
+                    });
+                }
+            }
+        } else {
+            $result = [];
+        }
+        if (!isset($result)) {
+            $result = $languages;
+        }
+        return $result;
+    }
 }