[BUGFIX] Fix problem with missing storagePid and incorrect error message in OAI (kitodo#1827)

Author: beatrycze-volk

Classes/Controller/OaiPmhController.php

@@ -411,11 +411,8 @@ protected function verbIdentify()
             // Provide a fallback timestamp if no document is found
             $oaiIdentifyInfo['earliestDatestamp'] = '0000-00-00T00:00:00Z';
 
-            // access storagePid from TypoScript
-            $pageSettings = $this->configurationManager->getConfiguration($this->configurationManager::CONFIGURATION_TYPE_FULL_TYPOSCRIPT);
-            $storagePid = $pageSettings["plugin."]["tx_dlf."]["persistence."]["storagePid"];
-            if ($storagePid > 0) {
-                $this->logger->notice('No records found with PID ' . $storagePid);
+            if ($this->settings['storagePid'] > 0) {
+                $this->logger->notice('No records found with PID ' . $this->settings['storagePid']);
             } else {
                 $this->logger->notice('No records found');
             }
@@ -460,22 +457,16 @@ protected function verbListIdentifiers()
         try {
             $documentSet = $this->fetchDocumentSet();
         } catch (\Exception $exception) {
+            $this->logger->error('Error fetching document set: ' . $exception->getErrorMessage());
             $this->error = 'idDoesNotExist';
             return;
         }
-        // create new and empty document list
-        $resultSet = [];
-        if (is_array($documentSet)) {
-            $resultSet['elements'] = $documentSet;
-            $resultSet['metadata'] = [
-                'cursor' => 0,
-                'completeListSize' => count($documentSet),
-                'metadataPrefix' => $this->parameters['metadataPrefix'],
-            ];
+
+        if (count($documentSet) == 0) {
+            return;
         }
 
-        $listIdentifiers = $this->generateOutputForDocumentList($resultSet);
-        $this->view->assign('listIdentifiers', $listIdentifiers);
+        $this->view->assign('listIdentifiers', $this->generateResultSet($documentSet));
     }
 
     /**
@@ -550,21 +541,15 @@ protected function verbListRecords()
         try {
             $documentSet = $this->fetchDocumentSet();
         } catch (\Exception $exception) {
+            $this->logger->error('Error fetching document set: ' . $exception->getErrorMessage());
             $this->error = 'idDoesNotExist';
             return;
         }
-        $resultSet = [];
-        if (count($documentSet) > 0) {
-            $resultSet['elements'] = $documentSet;
-            $resultSet['metadata'] = [
-                'cursor' => 0,
-                'completeListSize' => count($documentSet),
-                'metadataPrefix' => $this->parameters['metadataPrefix'],
-            ];
+        if (count($documentSet) == 0) {
+            return;
         }
 
-        $resultSet = $this->generateOutputForDocumentList($resultSet);
-        $this->view->assign('listRecords', $resultSet);
+        $this->view->assign('listRecords', $this->generateResultSet($documentSet));
     }
 
     /**
@@ -773,6 +758,28 @@ private function checkGranularity(): void
         }
     }
 
+    /**
+     * Generate result set
+     *
+     * @access private
+     *
+     * @param mixed[] $documentSet
+     *
+     * @return array
+     */
+    private function generateResultSet(array $documentSet): array
+    {
+        // create new and empty document list
+        $resultSet = [];
+        $resultSet['elements'] = $documentSet;
+        $resultSet['metadata'] = [
+            'cursor' => 0,
+            'completeListSize' => count($documentSet),
+            'metadataPrefix' => $this->parameters['metadataPrefix'],
+        ];
+        return $this->generateOutputForDocumentList($resultSet);
+    }
+
     /**
      * Fetch more information for document list
      *

Configuration/TypoScript/Plugins/OaiPmh/setup.typoscript

@@ -1,12 +1,13 @@
 plugin.tx_dlf_oaipmh {
-	view {
-		templateRootPaths {
-			0 = EXT:dlf/Resources/Private/Templates/OaiPmh
-			1 = {$plugin.tx_dlf.oaipmh.templateRootPath}
-		}
-	}
+  view {
+    templateRootPaths {
+      0 = EXT:dlf/Resources/Private/Templates/OaiPmh
+      1 = {$plugin.tx_dlf.oaipmh.templateRootPath}
+    }
+  }
   settings {
     title =
+    storagePid = {$plugin.tx_dlf.persistence.storagePid}
   }
 }