Fix rebase/merge issues

kitodo · Jun 18, 2024 · f750676 · f750676
1 parent cd9dbcc
commit f750676
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 17 deletions.
diff --git a/Classes/Common/Indexer.php b/Classes/Common/Indexer.php
@@ -331,7 +331,7 @@ protected static function processLogical(Document $document, array $logicalUnit)
  if (!empty($metadata)) {
  $extConf = GeneralUtility::makeInstance(ExtensionConfiguration::class)->get(self::$extKey, 'general');
  $validator = new DocumentValidator($metadata, explode(',', $extConf['requiredMetadataFields']));
- 
+
  if ($validator->hasAllMandatoryMetadataFields()) {
  $metadata['author'] = self::removeAppendsFromAuthor($metadata['author']);
  // set Owner if available
@@ -378,16 +378,16 @@ protected static function processLogical(Document $document, array $logicalUnit)
  in_array('collection', self::$fields['facets'])
  && empty($metadata['collection'])
  && !empty($doc->metadataArray[$doc->toplevelId]['collection'])
-  ) {
-  $solrDoc->setField('collection_faceting', $doc->metadataArray[$doc->toplevelId]['collection']);
-  }
-  try {
-  $updateQuery->addDocument($solrDoc);
-  self::$solr->service->update($updateQuery);
-  } catch (\Exception $e) {
-  self::handleException($e->getMessage());
-  return false;
-  }
+ ) {
+ $solrDoc->setField('collection_faceting', $doc->metadataArray[$doc->toplevelId]['collection']);
+ }
+ try {
+ $updateQuery->addDocument($solrDoc);
+ self::$solr->service->update($updateQuery);
+ } catch (\Exception $e) {
+ self::handleException($e->getMessage());
+ return false;
+ }
  } else {
  Helper::log('Tip: If "record_id" field is missing then there is possibility that METS file still contains it but with the wrong source type attribute in "recordIdentifier" element', LOG_SEVERITY_NOTICE);
  return false;

diff --git a/Classes/Domain/Repository/DocumentRepository.php b/Classes/Domain/Repository/DocumentRepository.php
@@ -583,9 +583,9 @@ public function findChildrenOfEach(array $uids)
  *
  * @return SolrSearch
  */
- public function findSolrByCollection(Collection $collection, $settings, $searchParams, $listedMetadata = null)
+ public function findSolrByCollection(Collection $collection, $settings, $searchParams, $listedMetadata = null, $indexedMetadata = null)
  {
- return $this->findSolr([$collection], $settings, $searchParams, $listedMetadata);
+ return $this->findSolr([$collection], $settings, $searchParams, $listedMetadata, $indexedMetadata);
  }
 
  /**
@@ -597,12 +597,13 @@ public function findSolrByCollection(Collection $collection, $settings, $searchP
  * @param array $settings
  * @param array $searchParams
  * @param QueryResult $listedMetadata
+ * @param QueryResult $indexedMetadata
  *
  * @return SolrSearch
  */
- public function findSolrByCollections($collections, $settings, $searchParams, $listedMetadata = null): SolrSearch
+ public function findSolrByCollections($collections, $settings, $searchParams, $listedMetadata = null, $indexedMetadata = null): SolrSearch
  {
- return $this->findSolr($collections, $settings, $searchParams, $listedMetadata);
+ return $this->findSolr($collections, $settings, $searchParams, $listedMetadata, $indexedMetadata);
  }
 
  /**
@@ -613,12 +614,13 @@ public function findSolrByCollections($collections, $settings, $searchParams, $l
  * @param array $settings
  * @param array $searchParams
  * @param QueryResult $listedMetadata
+ * @param QueryResult $indexedMetadata
  *
  * @return SolrSearch
  */
- public function findSolrWithoutCollection($settings, $searchParams, $listedMetadata = null): SolrSearch
+ public function findSolrWithoutCollection($settings, $searchParams, $listedMetadata = null, $indexedMetadata = null): SolrSearch
  {
- return $this->findSolr([], $settings, $searchParams, $listedMetadata);
+ return $this->findSolr([], $settings, $searchParams, $listedMetadata, $indexedMetadata);
  }
 
  /**