refs vufind-org#2999 handle nullable result set id - initializing to …

…null and concat to empty string
finc · Oct 18, 2024 · 46b2f01 · 46b2f01
1 parent 8cba230
commit 46b2f01
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/module/VuFind/src/VuFind/View/Helper/Root/Record.php b/module/VuFind/src/VuFind/View/Helper/Root/Record.php
@@ -868,11 +868,13 @@ protected function deduplicateLinks($links)
      */
     public function getUniqueHtmlElementId($idPrefix = '')
     {
+        $resultSetId = $this->driver->getResultSetIdentifier() ?? '';
+
         return preg_replace(
             "/\s+/",
             '_',
             ($idPrefix ? $idPrefix . '-' : '')
-            . $this->driver->getResultSetIdentifier() . '-'
+            . ($resultSetId ? $resultSetId . '-' : '')
             . $this->driver->getUniqueId()
         );
     }

diff --git a/module/VuFindSearch/src/VuFindSearch/Backend/AbstractBackend.php b/module/VuFindSearch/src/VuFindSearch/Backend/AbstractBackend.php
@@ -119,7 +119,12 @@ abstract public function getRecordCollectionFactory();
     protected function injectSourceIdentifier(RecordCollectionInterface $response)
     {
         $response->setSourceIdentifiers($this->identifier);
-        $response->setResultSetIdentifier($this->generateUuid());
+
+        if (count($response->getRecords()) > 0) {
+            // TODO: Replace custom UUID generation with Doctrine
+            // UUID generator once available (after the merge of #2233)
+            $response->setResultSetIdentifier($this->generateUuid());
+        }
 
         return $response;
     }