Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
64 changes: 44 additions & 20 deletions Classes/Common/Indexer.php
Original file line number Diff line number Diff line change
Expand Up @@ -407,15 +407,9 @@ protected static function processPhysical(Document $document, int $page, array $

$solrDoc->setField('fulltext', $fullText);
if (is_array($doc->metadataArray[$doc->toplevelId])) {
self::addFaceting($doc, $solrDoc);
}
// Add collection information to physical sub-elements if applicable.
if (
in_array('collection', self::$fields['facets'])
&& !empty($doc->metadataArray[$doc->toplevelId]['collection'])
) {
$solrDoc->setField('collection_faceting', $doc->metadataArray[$doc->toplevelId]['collection']);
self::addFaceting($doc, $solrDoc, $physicalUnit);
}

try {
$updateQuery->addDocument($solrDoc);
self::$solr->service->update($updateQuery);
Expand Down Expand Up @@ -502,26 +496,56 @@ private static function processMetadata($document, $metadata, &$solrDoc): array
*
* @param AbstractDocument $doc
* @param DocumentInterface &$solrDoc
* @param array $physicalUnit Array of the physical unit to process
*
* @return void
*/
private static function addFaceting($doc, &$solrDoc): void
private static function addFaceting($doc, &$solrDoc, $physicalUnit): void
{
foreach ($doc->metadataArray[$doc->toplevelId] as $indexName => $data) {
// this variable holds all possible facet-values for the index names
$facets = [];
// use the structlink information
foreach ($doc->smLinks['l2p'] as $logicalId => $physicalId) {
// find page in structlink
if (in_array($physicalUnit['id'], $physicalId)) {
// for each associated metadata of structlink
foreach ($doc->metadataArray[$logicalId] as $indexName => $data) {
if (
!empty($data)
&& substr($indexName, -8) !== '_sorting'
) {
if (in_array($indexName, self::$fields['facets'])) {
// Remove appended "valueURI" from authors' names for indexing.
if ($indexName == 'author') {
$data = self::removeAppendsFromAuthor($data);
}
// Add facets to facet-array and flatten the values
if (is_array($data)) {
foreach ($data as $value) {
if (!empty($value)) {
$facets[$indexName][] = $value;
}
}
} else {
$facets[$indexName][] = $data;
}
}
}
}
}
}

// write all facet values of associated metadata to the page (self & ancestors)
foreach ($facets as $indexName => $data) {
if (
!empty($data)
&& substr($indexName, -8) !== '_sorting'
) {

if (in_array($indexName, self::$fields['facets'])) {
// Remove appended "valueURI" from authors' names for indexing.
if ($indexName == 'author') {
$data = self::removeAppendsFromAuthor($data);
}
// Add facets to index.
$solrDoc->setField($indexName . '_faceting', $data);
}
$solrDoc->setField($indexName . '_faceting', $data);
}
}

// add sorting information
foreach ($doc->metadataArray[$doc->toplevelId] as $indexName => $data) {
// Add sorting information to physical sub-elements if applicable.
if (
!empty($data)
Expand Down