Normalize int fields properly.

NatLibFi · Jan 10, 2025 · 87567a6 · 87567a6
1 parent 91836d5
commit 87567a6
Showing 1 changed file with 15 additions and 10 deletions.
diff --git a/src/RecordManager/Base/Solr/SolrUpdater.php b/src/RecordManager/Base/Solr/SolrUpdater.php
@@ -47,6 +47,7 @@
 use function defined;
 use function in_array;
 use function is_array;
+use function is_string;
 use function strlen;
 
 /**
@@ -2401,11 +2402,13 @@ protected function normalizeFields(array &$data)
         foreach ($data as $key => &$values) {
             if (is_array($values)) {
                 foreach ($values as $key2 => &$value) {
-                    $value = $this->metadataUtils->normalizeUnicode(
-                        $value,
-                        $this->unicodeNormalizationForm
-                    );
-                    $value = $this->trimFieldLength($key, $value);
+                    if (is_string($value)) {
+                        $value = $this->metadataUtils->normalizeUnicode(
+                            $value,
+                            $this->unicodeNormalizationForm
+                        );
+                        $value = $this->trimFieldLength($key, $value);
+                    }
                     if (in_array($value, $this->nonIndexedValues, true)) {
                         unset($values[$key2]);
                     }
@@ -2416,11 +2419,13 @@ protected function normalizeFields(array &$data)
                     $values = array_values(array_unique($values));
                 }
             } elseif ($key !== 'fullrecord') {
-                $values = $this->metadataUtils->normalizeUnicode(
-                    $values,
-                    $this->unicodeNormalizationForm
-                );
-                $values = $this->trimFieldLength($key, $values);
+                if (is_string($values)) {
+                    $values = $this->metadataUtils->normalizeUnicode(
+                        $values,
+                        $this->unicodeNormalizationForm
+                    );
+                    $values = $this->trimFieldLength($key, $values);
+                }
 
                 if (in_array($values, $this->nonIndexedValues, true)) {
                     unset($data[$key]);