Merge branch 'main' into https

kitodo · Feb 1, 2025 · cc831c0 · cc831c0
2 parents 126e043 + 4358e98
commit cc831c0
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 8 deletions.
diff --git a/Classes/Common/Solr/Solr.php b/Classes/Common/Solr/Solr.php
@@ -331,11 +331,11 @@ public static function getNextCoreNumber(int $number = 0): int
         $number = max($number, 0);
         // Check if core already exists.
         $solr = self::getInstance('dlfCore' . $number);
-        if (!$solr->ready) {
-            return $number;
-        } else {
-            return self::getNextCoreNumber($number + 1);
+        while ($solr->ready) {
+            $number++;
+            $solr = self::getInstance('dlfCore' . $number);
         }
+        return $number;
     }
 
     /**

diff --git a/Classes/Controller/OaiPmhController.php b/Classes/Controller/OaiPmhController.php
@@ -394,10 +394,6 @@ protected function verbIdentify()
 
         $oaiIdentifyInfo = [];
 
-        if (!$oaiIdentifyInfo) {
-            $this->logger->notice('Incomplete plugin configuration');
-        }
-
         $oaiIdentifyInfo['oai_label'] = $library ? $library->getOaiLabel() : '';
         // Use default values for an installation with incomplete plugin configuration.
         if (empty($oaiIdentifyInfo['oai_label'])) {