[FEATURE] Remove client-side paging redundancies

.editorconfig

@@ -14,7 +14,7 @@ trim_trailing_whitespace = true
 
 # TS/JS-Files
 [*.{ts,js}]
-indent_size = 2
+indent_size = 4
 
 # JSON-Files
 [*.json]

.github/phpstan.neon

@@ -14,6 +14,8 @@ parameters:
     - '#Call to an undefined method Kitodo\\Dlf\\Domain\\Repository\\[a-zA-Z]+Repository::findOneByUid\(\)\.#'
     - '#Call to an undefined method Psr\\Http\\Message\\RequestFactoryInterface::request\(\)\.#'
     - '#Call to an undefined method Solarium\\Core\\Query\\DocumentInterface::setField\(\)\.#'
+    - '#Call to an undefined method Ubl\\Iiif\\Presentation\\Common\\Model\\Resources\\CanvasInterface::getImages\(\)\.#'
+    - '#Call to an undefined method Ubl\\Iiif\\Presentation\\Common\\Model\\Resources\\CanvasInterface::getOtherContent\(\)\.#'
     - '#Call to an undefined method Ubl\\Iiif\\Presentation\\Common\\Model\\Resources\\IiifResourceInterface::getHeight\(\)\.#'
     - '#Call to an undefined method Ubl\\Iiif\\Presentation\\Common\\Model\\Resources\\IiifResourceInterface::getWidth\(\)\.#'
     - '#Call to an undefined method Ubl\\Iiif\\Presentation\\Common\\Model\\Resources\\IiifResourceInterface::getPossibleTextAnnotationContainers\(\)\.#'

Classes/Command/BaseCommand.php

@@ -292,7 +292,7 @@ protected function getParentDocumentUidForSaving(Document $document, bool $softC
 
         if ($doc !== null && !empty($doc->parentHref)) {
             // find document object by record_id of parent
-            $parent = AbstractDocument::getInstance($doc->parentHref, ['storagePid' => $this->storagePid]);
+            $parent = AbstractDocument::getInstance($doc->parentHref, 0, ['storagePid' => $this->storagePid]);
 
             if ($parent->recordId) {
                 $parentDocument = $this->documentRepository->findOneByRecordId($parent->recordId);

Classes/Command/DeleteCommand.php

@@ -217,7 +217,7 @@ private function getDocument($input): ?Document
         if (MathUtility::canBeInterpretedAsInteger($input->getOption('doc'))) {
             $document = $this->documentRepository->findByUid($input->getOption('doc'));
         } elseif (GeneralUtility::isValidUrl($input->getOption('doc'))) {
-            $doc = AbstractDocument::getInstance($input->getOption('doc'), ['storagePid' => $this->storagePid], true);
+            $doc = AbstractDocument::getInstance($input->getOption('doc'), 0, ['storagePid' => $this->storagePid], true);
 
             if ($doc->recordId) {
                 $document = $this->documentRepository->findOneByRecordId($doc->recordId);

Classes/Command/HarvestCommand.php

@@ -232,7 +232,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
             $docLocation = $baseLocation . http_build_query($params);
             // ...index the document...
             $document = null;
-            $doc = AbstractDocument::getInstance($docLocation, ['storagePid' => $this->storagePid], true);
+            $doc = AbstractDocument::getInstance($docLocation, 0, ['storagePid' => $this->storagePid], true);
 
             if ($doc === null) {
                 $io->warning('WARNING: Document "' . $docLocation . '" could not be loaded. Skip to next document.');

Classes/Command/IndexCommand.php

@@ -168,11 +168,11 @@ protected function execute(InputInterface $input, OutputInterface $output): int
                 $io->error('ERROR: Document with UID "' . $input->getOption('doc') . '" could not be found on PID ' . $this->storagePid . ' .');
                 return BaseCommand::FAILURE;
             } else {
-                $doc = AbstractDocument::getInstance($document->getLocation(), ['storagePid' => $this->storagePid], true);
+                $doc = AbstractDocument::getInstance($document->getLocation(), 0, ['storagePid' => $this->storagePid], true);
             }
 
         } else if (GeneralUtility::isValidUrl($input->getOption('doc'))) {
-            $doc = AbstractDocument::getInstance($input->getOption('doc'), ['storagePid' => $this->storagePid], true);
+            $doc = AbstractDocument::getInstance($input->getOption('doc'), 0, ['storagePid' => $this->storagePid], true);
 
             $document = $this->getDocumentFromUrl($doc, $input->getOption('doc'));
         }

Classes/Command/ReindexCommand.php

@@ -204,7 +204,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
         }
 
         foreach ($documents as $id => $document) {
-            $doc = AbstractDocument::getInstance($document->getLocation(), ['storagePid' => $this->storagePid], true);
+            $doc = AbstractDocument::getInstance($document->getLocation(), 0, ['storagePid' => $this->storagePid], true);
 
             if ($doc === null) {
                 $io->warning('WARNING: Document "' . $document->getLocation() . '" could not be loaded. Skip to next document.');

Classes/Common/AbstractDocument.php

@@ -71,6 +71,12 @@ abstract class AbstractDocument
      */
     protected int $cPid = 0;
 
+    /**
+     * @access protected
+     * @var int This holds the page ID for the requests
+     */
+    protected int $pageId = 0;
+
     /**
      * @access public
      * @static
@@ -515,6 +521,27 @@ abstract protected function prepareMetadataArray(int $cPid): void;
      */
     abstract protected function setPreloadedDocument($preloadedDocument): bool;
 
+    /**
+     * Get information about all files contained in the document, or null if this information is not available.
+     *
+     * Returns an associative array of the following form:
+     *
+     * ```php
+     * [
+     *     '#FILE_ID' => [
+     *         'url' => '...',
+     *         'mimetype' => '...',
+     *     ],
+     *     // ...
+     * ]
+     * ```
+     *
+     * @access public
+     *
+     * @return array
+     */
+    abstract public function getAllFiles(): array;
+
     /**
      * This is a singleton class, thus an instance must be created by this method
      *
@@ -523,12 +550,13 @@ abstract protected function setPreloadedDocument($preloadedDocument): bool;
      * @static
      *
      * @param string $location The URL of XML file or the IRI of the IIIF resource
+     * @param int $pageId
      * @param array $settings
      * @param bool $forceReload Force reloading the document instead of returning the cached instance
      *
      * @return AbstractDocument|null Instance of this class, either MetsDocument or IiifManifest
      */
-    public static function &getInstance(string $location, array $settings = [], bool $forceReload = false)
+    public static function &getInstance(string $location, int $pageId = 0, array $settings = [], bool $forceReload = false)
     {
         // Create new instance depending on format (METS or IIIF) ...
         $documentFormat = null;
@@ -576,14 +604,14 @@ public static function &getInstance(string $location, array $settings = [], bool
         // Sanitize input.
         $pid = array_key_exists('storagePid', $settings) ? max((int) $settings['storagePid'], 0) : 0;
         if ($documentFormat == 'METS') {
-            $instance = new MetsDocument($pid, $location, $xml, $settings);
+            $instance = new MetsDocument($pid, $location, $pageId, $xml, $settings);
         } elseif ($documentFormat == 'IIIF') {
             // TODO: Parameter $preloadedDocument of class Kitodo\Dlf\Common\IiifManifest constructor expects SimpleXMLElement|Ubl\Iiif\Presentation\Common\Model\Resources\IiifResourceInterface, Ubl\Iiif\Presentation\Common\Model\AbstractIiifEntity|null given.
             // @phpstan-ignore-next-line
-            $instance = new IiifManifest($pid, $location, $iiif);
+            $instance = new IiifManifest($pid, $location, $pageId, $iiif);
         }
 
-        if ($instance !== null) {
+        if ($instance) {
             self::setDocumentCache($location, $instance);
         }
 
@@ -1140,7 +1168,7 @@ protected function magicGetRootId(): int
             if ($this->parentId) {
                 // TODO: Parameter $location of static method AbstractDocument::getInstance() expects string, int<min, -1>|int<1, max> given.
                 // @phpstan-ignore-next-line
-                $parent = self::getInstance($this->parentId, ['storagePid' => $this->pid]);
+                $parent = self::getInstance($this->parentId, $this->pageId, ['storagePid' => $this->pid]);
                 $this->rootId = $parent->rootId;
             }
             $this->rootIdLoaded = true;
@@ -1188,14 +1216,16 @@ protected function _setCPid(int $value): void
      *
      * @param int $pid If > 0, then only document with this PID gets loaded
      * @param string $location The location URL of the XML file to parse
+     * @param int $pageId
      * @param \SimpleXMLElement|IiifResourceInterface $preloadedDocument Either null or the \SimpleXMLElement
      * or IiifResourceInterface that has been loaded to determine the basic document format.
      *
      * @return void
      */
-    protected function __construct(int $pid, string $location, $preloadedDocument, array $settings = [])
+    protected function __construct(int $pid, string $location, int $pageId, $preloadedDocument, array $settings = [])
     {
         $this->pid = $pid;
+        $this->pageId = $pageId;
         $this->setPreloadedDocument($preloadedDocument);
         $this->init($location, $settings);
         $this->establishRecordId($pid);
@@ -1301,4 +1331,114 @@ private static function setDocumentCache(string $location, AbstractDocument $cur
         // Save value in cache
         $cache->set($cacheIdentifier, $currentDocument);
     }
+
+    /**
+     * Get IDs of logical structures that a page belongs to, indexed by depth.
+     *
+     * @param int $pageNo
+     * @return array
+     */
+    public function getLogicalSectionsOnPage($pageNo)
+    {
+        $this->magicGetSmLinks();
+        $this->magicGetPhysicalStructure();
+
+        $ids = [];
+        if (!empty($this->physicalStructure[$pageNo]) && !empty($this->smLinks['p2l'][$this->physicalStructure[$pageNo]])) {
+            foreach ($this->smLinks['p2l'][$this->physicalStructure[$pageNo]] as $logId) {
+                $depth = $this->getStructureDepth($logId);
+                $ids[$depth][] = $logId;
+            }
+        }
+        ksort($ids);
+        reset($ids);
+        return $ids;
+    }
+
+    /**
+     * Get URL of download file of specified page, or the empty string if there is no such link.
+     *
+     * @param int $pageNumber
+     * @return string
+     */
+    public function getPageLink($pageNumber)
+    {
+        $extConf = GeneralUtility::makeInstance(ExtensionConfiguration::class)->get(self::$extKey);
+        $fileGrpsDownload = GeneralUtility::trimExplode(',', $extConf['files']['fileGrpDownload']);
+        // Get image link.
+        foreach ($fileGrpsDownload as $fileGrpDownload) {
+            if (!empty($this->physicalStructureInfo[$this->physicalStructure[$pageNumber]]['files'][$fileGrpDownload])) {
+                return $this->getFileLocation($this->physicalStructureInfo[$this->physicalStructure[$pageNumber]]['files'][$fileGrpDownload]);
+            }
+        }
+        return '';
+    }
+
+    public function toArray($uriBuilder, array $config = [])
+    {
+        $this->magicGetSmLinks();
+        $this->magicGetPhysicalStructure();
+
+        $proxyFileGroups = $config['proxyFileGroups'] ?? [];
+        $forceAbsoluteUrl = $config['forceAbsoluteUrl'] ?? false;
+        $minPage = $config['minPage'] ?? 1;
+        $maxPage = $config['maxPage'] ?? $this->numPages;
+
+        $result = [
+            'pages' => [],
+            'query' => [
+                'minPage' => $minPage
+            ]
+        ];
+
+        $allFiles = $this->getAllFiles();
+
+        for ($page = $minPage; $page <= $maxPage; $page++) {
+            $pageEntry = [
+                'logSections' => array_merge(...$this->getLogicalSectionsOnPage($page)),
+                'files' => [],
+            ];
+
+            foreach ($this->physicalStructureInfo[$this->physicalStructure[$page]]['files'] as $fileGrp => $fileId) {
+                if (!$allFiles) {
+                    $file = [
+                        'url' => $this->getFileLocation($fileId),
+                        'mimetype' => $this->getFileMimeType($fileId),
+                    ];
+                } else {
+                    $file = $allFiles[$fileId] ?? null;
+                    if ($file === null) {
+                        continue;
+                    }
+                }
+
+                $extConf = GeneralUtility::makeInstance(ExtensionConfiguration::class)->get(self::$extKey);
+                $nonProxyMimeTypes = GeneralUtility::trimExplode(',', $extConf['nonProxyMimeTypes']);
+
+                // Only deliver static images via the internal PageViewProxy.
+                // (For IIP and IIIF, the viewer needs to build and access a separate metadata URL, see `getMetadataURL`.)
+                if (in_array($fileGrp, $proxyFileGroups) && !in_array($file['mimetype'], $nonProxyMimeTypes)) {
+                    // Configure @action URL for form.
+                    $file['url'] = $uriBuilder
+                        ->reset()
+                        ->setTargetPageUid($this->pageId)
+                        ->setCreateAbsoluteUri($forceAbsoluteUrl)
+                        ->setArguments(
+                            [
+                                'eID' => 'tx_dlf_pageview_proxy',
+                                'url' => $file['url'],
+                                'uHash' => GeneralUtility::hmac($file['url'], 'PageViewProxy')
+                            ]
+                        )
+                        ->build();
+                }
+
+                $pageEntry['files'][$fileGrp] = $file;
+            }
+
+            $result['pages'][] = $pageEntry;
+        }
+
+        return $result;
+    }
 }

Classes/Common/IiifManifest.php

@@ -419,6 +419,56 @@ public function getFileMimeType(string $id): string
         return $format;
     }
 
+    /**
+     * @see AbstractDocument::getAllFiles()
+     */
+    public function getAllFiles(): array
+    {
+        $files = [];
+        $canvases = $this->iiif->getDefaultCanvases();
+        foreach ($canvases as $canvas) {
+            $images = $canvas->getImages();
+            foreach ($images as $image) {
+                $resource = $image->getResource();
+                $fileId = $resource->getId();
+                if (empty($fileId)) {
+                    continue;
+                }
+
+                $mimetype = $this->getFileMimeType($fileId);
+                if (empty($mimetype)) {
+                    continue;
+                }
+
+                $files[$fileId] = [
+                    'url' => $fileId,
+                    'mimetype' => $mimetype,
+                ];
+            }
+
+            $otherFiles = $canvas->getOtherContent();
+            foreach ($otherFiles as $otherFile) {
+                $fileId = $$otherFile->getId();
+                if (empty($fileId)) {
+                    continue;
+                }
+
+                $mimetype = $this->getFileMimeType($fileId);
+                if (empty($mimetype)) {
+                    continue;
+                }
+
+                // in IIIF id is URL
+                $files[$fileId] = [
+                    'url' => $fileId,
+                    'mimetype' => $mimetype,
+                ];
+            }
+
+        }
+        return $files;
+    }
+
     /**
      * @see AbstractDocument::getLogicalStructure()
      */
@@ -854,8 +904,7 @@ protected function ensureHasFulltextIsSet(): void
          *  https://digi.ub.uni-heidelberg.de/diglit/iiif/hirsch_hamburg1933_04_25/list/0001.json
          */
         if (!$this->hasFulltextSet && $this->iiif instanceof ManifestInterface) {
-            $manifest = $this->iiif;
-            $canvases = $manifest->getDefaultCanvases();
+            $canvases = $this->iiif->getDefaultCanvases();
             foreach ($canvases as $canvas) {
                 if (
                     !empty($canvas->getSeeAlsoUrlsForFormat("application/alto+xml")) ||

Classes/Common/Indexer.php

@@ -109,7 +109,7 @@ public static function add(Document $document, DocumentRepository $documentRepos
                 $parent = $documentRepository->findByUid($parentId);
                 if ($parent) {
                     // get XML document of parent
-                    $doc = AbstractDocument::getInstance($parent->getLocation(), ['storagePid' => $parent->getPid()], true);
+                    $doc = AbstractDocument::getInstance($parent->getLocation(), 0, ['storagePid' => $parent->getPid()], true);
                     if ($doc !== null) {
                         $parent->setCurrentDocument($doc);
                         $success = self::add($parent, $documentRepository);