Skip to content

Commit 605b5e2

Browse files
committed
fixup PhysicalStructure after rebase
1 parent 7fe67a6 commit 605b5e2

File tree

1 file changed

+3
-14
lines changed

1 file changed

+3
-14
lines changed

Classes/Common/MetsDocument.php

Lines changed: 3 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -447,7 +447,6 @@ private function getFiles(array &$details, ?SimpleXMLElement $filePointers): voi
447447
*/
448448
private function getPage(array &$details, ?SimpleXMLElement $metsPointers): void
449449
{
450-
// Is there a mptr node?
451450
if (count($metsPointers)) {
452451
// Yes. Get the file reference.
453452
$details['points'] = (string) $metsPointers[0]->attributes('http://www.w3.org/1999/xlink')->href;
@@ -486,16 +485,15 @@ private function getPage(array &$details, ?SimpleXMLElement $metsPointers): void
486485
protected function getTimecode(array $logInfo): ?array
487486
{
488487
// Load plugin configuration.
489-
$extConf = GeneralUtility::makeInstance(ExtensionConfiguration::class)->get(self::$extKey, 'files');
490-
$fileGrpsVideo = GeneralUtility::trimExplode(',', $extConf['fileGrpVideo']);
488+
$useGroupsVideo = $this->useGroupsConfiguration->getVideo();
491489

492-
foreach ($fileGrpsVideo as $fileGrpVideo) {
490+
foreach ($useGroupsVideo as $useGroupVideo) {
493491
if (!isset($this->smLinks['l2p'][$logInfo['id']][0])) {
494492
continue;
495493
}
496494

497495
$physInfo = $this->physicalStructureInfo[$this->smLinks['l2p'][$logInfo['id']][0]];
498-
$fileIds = $physInfo['all_files'][$fileGrpVideo] ?? [];
496+
$fileIds = $physInfo['all_files'][$useGroupVideo] ?? [];
499497

500498
$chapter = null;
501499

@@ -1471,15 +1469,6 @@ protected function magicGetPhysicalStructure(): array
14711469
$this->physicalStructureInfo[$id]['orderlabel'] = $this->getAttribute($firstNode['ORDERLABEL']);
14721470
$this->physicalStructureInfo[$id]['type'] = (string) $firstNode['TYPE'];
14731471
$this->physicalStructureInfo[$id]['contentIds'] = $this->getAttribute($firstNode['CONTENTIDS']);
1474-
// @fschoelzel: needs review
1475-
// Get the file representations from fileSec node.
1476-
foreach ($physNode[0]->children('http://www.loc.gov/METS/')->fptr as $fptr) {
1477-
// Check if file has valid @USE attribute.
1478-
if (!empty($fileUse[(string) $fptr->attributes()->FILEID])) {
1479-
$this->physicalStructureInfo[$id]['files'][$fileUse[(string) $fptr->attributes()->FILEID]] = (string) $fptr->attributes()->FILEID;
1480-
$this->physicalStructureInfo[$id]['all_files'][$fileUse[(string) $fptr->attributes()->FILEID]][] = (string) $fptr->attributes()->FILEID;
1481-
}
1482-
}
14831472

14841473
$this->getFileRepresentation($id, $firstNode);
14851474

0 commit comments

Comments
 (0)