Merge branch 'master' into two-level-metadata

kitodo · Jun 12, 2023 · fc4ceb7 · fc4ceb7
2 parents e2258f1 + 4256816
commit fc4ceb7
Show file tree

Hide file tree

Showing 13 changed files with 355 additions and 230 deletions.
diff --git a/Classes/Command/BaseCommand.php b/Classes/Command/BaseCommand.php
@@ -295,36 +295,29 @@ protected function getParentDocumentUidForSaving(Document $document)
     {
         $doc = $document->getDoc();
 
-        if ($doc !== null) {
-            // Same as MetsDocument::parentHref (TODO: Use it)
-            // Get the closest ancestor of the current document which has a MPTR child.
-            $parentMptr = $doc->mets->xpath('./mets:structMap[@TYPE="LOGICAL"]//mets:div[@ID="' . $doc->toplevelId . '"]/ancestor::mets:div[./mets:mptr][1]/mets:mptr');
-            if (!empty($parentMptr)) {
-                $parentLocation = (string) $parentMptr[0]->attributes('http://www.w3.org/1999/xlink')->href;
-
-                // find document object by record_id of parent
-                $parentDoc = Doc::getInstance($parentLocation, ['storagePid' => $this->storagePid]);
-
-                if ($parentDoc->recordId) {
-                    $parentDocument = $this->documentRepository->findOneByRecordId($parentDoc->recordId);
-
-                    if ($parentDocument === null) {
-                        // create new Document object
-                        $parentDocument = GeneralUtility::makeInstance(Document::class);
-                    }
-
-                    $parentDocument->setOwner($this->owner);
-                    $parentDocument->setDoc($parentDoc);
-                    $parentDocument->setLocation($parentLocation);
-                    $parentDocument->setSolrcore($document->getSolrcore());
-
-                    $success = $this->saveToDatabase($parentDocument);
-
-                    if ($success === true) {
-                        // add to index
-                        Indexer::add($parentDocument);
-                        return $parentDocument->getUid();
-                    }
+        if ($doc !== null && !empty($doc->parentHref)) {
+            // find document object by record_id of parent
+            $parentDoc = Doc::getInstance($doc->parentHref, ['storagePid' => $this->storagePid]);
+
+            if ($parentDoc->recordId) {
+                $parentDocument = $this->documentRepository->findOneByRecordId($parentDoc->recordId);
+
+                if ($parentDocument === null) {
+                    // create new Document object
+                    $parentDocument = GeneralUtility::makeInstance(Document::class);
+                }
+
+                $parentDocument->setOwner($this->owner);
+                $parentDocument->setDoc($parentDoc);
+                $parentDocument->setLocation($doc->parentHref);
+                $parentDocument->setSolrcore($document->getSolrcore());
+
+                $success = $this->saveToDatabase($parentDocument);
+
+                if ($success === true) {
+                    // add to index
+                    Indexer::add($parentDocument);
+                    return $parentDocument->getUid();
                 }
             }
         }

diff --git a/Classes/Common/Indexer.php b/Classes/Common/Indexer.php
@@ -349,10 +349,9 @@ protected static function processLogical(Document $document, array $logicalUnit)
                 } elseif (preg_match("/^[\d]{8}$/", $metadata['date'][0])){
                     $solrDoc->setField('date', date("Y-m-d", strtotime($metadata['date'][0])));
                 // convert any datetime to proper ISO extended datetime format and timezone for SOLR
-                } else {
+                } elseif (preg_match("/^[0-9]{4}-[0-9]{2}-[0-9]{2}T.*$/", $metadata['date'][0])) {
                     $solrDoc->setField('date', date('Y-m-d\TH:i:s\Z', strtotime($metadata['date'][0])));
                 }
-                $solrDoc->setField('date', $metadata['date'][0]);
             }
             $solrDoc->setField('record_id', $metadata['record_id'][0]);
             $solrDoc->setField('purl', $metadata['purl'][0]);

diff --git a/Classes/Common/MetsDocument.php b/Classes/Common/MetsDocument.php
@@ -1315,7 +1315,7 @@ protected function _getToplevelId()
     /**
      * Try to determine URL of parent document.
      *
-     * @return string|null
+     * @return string
      */
     public function _getParentHref()
     {

diff --git a/Classes/Common/SolrSearch.php b/Classes/Common/SolrSearch.php
@@ -381,7 +381,7 @@ public function submit($start, $rows, $processResults = true)
                                 $metadataOf = $this->fetchToplevelMetadataFromSolr([
                                     'query' => 'partof:' . $doc['uid'],
                                     'start' => 0,
-                                    'rows' => 100,
+                                    'rows' => 200,
                                 ]);
                                 foreach ($children as $docChild) {
                                     // We need only a few fields from the children, but we need them as array.

diff --git a/Classes/Controller/MetadataController.php b/Classes/Controller/MetadataController.php
@@ -391,8 +391,8 @@ private function getMetadata()
             // Get current structure's @ID.
             $ids = [];
             if (!empty($this->doc->physicalStructure[$this->requestData['page']]) && !empty($this->doc->smLinks['p2l'][$this->doc->physicalStructure[$this->requestData['page']]])) {
-                foreach ($this->doc->smLinks['p2l'][$doc->physicalStructure[$this->requestData['page']]] as $logId) {
-                    $count = $doc->getStructureDepth($logId);
+                foreach ($this->doc->smLinks['p2l'][$this->doc->physicalStructure[$this->requestData['page']]] as $logId) {
+                    $count = $this->doc->getStructureDepth($logId);
                     $ids[$count][] = $logId;
                 }
             }

diff --git a/Classes/Controller/TableOfContentsController.php b/Classes/Controller/TableOfContentsController.php
@@ -113,6 +113,7 @@ protected function makeMenuArray()
                 }
             }
         }
+        $this->sortMenu($menuArray);
         return $menuArray;
     }
 
@@ -135,7 +136,7 @@ protected function getMenuEntry(array $entry, $recursive = false)
         $entryArray['title'] = !empty($entry['label']) ? $entry['label'] : $entry['orderlabel'];
         $entryArray['volume'] = $entry['volume'];
         $entryArray['orderlabel'] = $entry['orderlabel'];
-        $entryArray['type'] = Helper::translate($entry['type'], 'tx_dlf_structures', $this->settings['storagePid']);
+        $entryArray['type'] = $this->getTranslatedType($entry['type']);
         $entryArray['pagination'] = htmlspecialchars($entry['pagination']);
         $entryArray['_OVERRIDE_HREF'] = '';
         $entryArray['doNotLinkIt'] = 1;
@@ -237,4 +238,39 @@ protected function resolveMenuEntry($entry)
 
         return $entry;
     }
+
+    /**
+     * Get translated type of entry.
+     * 
+     * @param array $type
+     * @return string
+     */
+    private function getTranslatedType($type) {
+        return Helper::translate($type, 'tx_dlf_structures', $this->settings['storagePid']);
+    }
+
+    /**
+     * Sort menu by orderlabel - currently implemented for newspaper.
+     * //TODO: add for years
+     * 
+     * @param array &$menu
+     * @return void
+     */
+    private function sortMenu(&$menu) {
+        if ($menu[0]['type'] == $this->getTranslatedType("newspaper")) {
+            $this->sortMenuForNewspapers($menu);
+        }
+    }
+
+    /**
+     * Sort menu years of the newspaper by orderlabel.
+     * 
+     * @param array &$menu
+     * @return void
+     */
+    private function sortMenuForNewspapers(&$menu) {
+        usort($menu[0]['_SUB_MENU'], function ($firstYear, $secondYear) {
+            return $firstYear['orderlabel'] <=> $secondYear['orderlabel'];
+        });
+    }
 }
diff --git a/Classes/Controller/ToolboxController.php b/Classes/Controller/ToolboxController.php
@@ -64,28 +64,35 @@ private function renderTool() {
         if (!empty($this->settings['tool'])) {
             switch ($this->settings['tool']) {
                 case 'tx_dlf_annotationtool':
+                case 'annotationtool':
                     $this->renderToolByName('renderAnnotationTool');
                     break;
                 case 'tx_dlf_fulltextdownloadtool':
+                case 'fulltextdownloadtool':
                     $this->renderToolByName('renderFulltextDownloadTool');
                     break;
                 case 'tx_dlf_fulltexttool':
+                case 'fulltexttool':
                     $this->renderToolByName('renderFulltextTool');
                     break;
                 case 'tx_dlf_imagedownloadtool':
+                case 'imagedownloadtool':
                     $this->renderToolByName('renderImageDownloadTool');
                     break;
                 case 'tx_dlf_imagemanipulationtool':
+                case 'imagemanipulationtool':
                     $this->renderToolByName('renderImageManipulationTool');
                     break;
                 case 'tx_dlf_pdfdownloadtool':
+                case 'pdfdownloadtool':
                     $this->renderToolByName('renderPdfDownloadTool');
                     break;
                 case 'tx_dlf_searchindocumenttool':
+                case 'searchindocumenttool':
                     $this->renderToolByName('renderSearchInDocumentTool');
                     break;
                 default:
-                    $this->logger->warn('Incorrect tool configuration: "' . $this->settings['tool'] . '". This tool does not exist.');
+                    $this->logger->warning('Incorrect tool configuration: "' . $this->settings['tool'] . '". This tool does not exist.');
             }
         }
     }

diff --git a/Configuration/FlexForms/Search.xml b/Configuration/FlexForms/Search.xml
@@ -41,6 +41,16 @@
                             </config>
                         </TCEforms>
                     </settings.fulltext>
+                    <settings.fulltextPreselect>
+                        <TCEforms>
+                            <exclude>1</exclude>
+                            <label>LLL:EXT:dlf/Resources/Private/Language/locallang_be.xlf:plugins.search.flexform.fulltextPreselect</label>
+                            <config>
+                                <type>check</type>
+                                <default>0</default>
+                            </config>
+                        </TCEforms>
+                    </settings.fulltextPreselect>
                     <settings.datesearch>
                         <TCEforms>
                             <exclude>1</exclude>

diff --git a/Documentation/Plugins/Index.rst b/Documentation/Plugins/Index.rst
@@ -700,6 +700,20 @@ Search
        :ref:`t3tsref:data-type-boolean`
    :Default:
 
+ - :Property:
+       fulltextPreselect
+   :Data Type:
+       :ref:`t3tsref:data-type-boolean`
+   :Default:
+       0
+
+ - :Property:
+       datesearch
+   :Data Type:
+       :ref:`t3tsref:data-type-boolean`
+   :Default:
+       0
+
  - :Property:
        solrcore
    :Data Type:

diff --git a/Resources/Private/Language/de.locallang_be.xlf b/Resources/Private/Language/de.locallang_be.xlf
@@ -435,7 +435,11 @@
 			</trans-unit>
 			<trans-unit id="plugins.search.flexform.fulltext" approved="yes">
 				<source><![CDATA[Enable full text search?]]></source>
-				<target><![CDATA[Volltext-Suche aktivieren?]]></target>
+				<target><![CDATA[Volltextsuche aktivieren?]]></target>
+			</trans-unit>
+			<trans-unit id="plugins.search.flexform.fulltextPreselect" approved="yes">
+				<source><![CDATA[Preselect full text search?]]></source>
+				<target><![CDATA[Volltextsuche vorauswählen?]]></target>
 			</trans-unit>
 			<trans-unit id="plugins.search.flexform.datesearch" approved="yes">
                 <source><![CDATA[Enable date search?]]></source>

diff --git a/Resources/Private/Language/locallang_be.xlf b/Resources/Private/Language/locallang_be.xlf
@@ -89,6 +89,9 @@
 			<trans-unit id="plugins.search.flexform.fulltext">
 				<source><![CDATA[Enable full text search?]]></source>
 			</trans-unit>
+			<trans-unit id="plugins.search.flexform.fulltextPreselect">
+				<source><![CDATA[Preselect full text search?]]></source>
+			</trans-unit>
 			<trans-unit id="plugins.search.flexform.datesearch">
                 <source><![CDATA[Enable date search?]]></source>
             </trans-unit>

diff --git a/Resources/Private/Templates/Search/Main.html b/Resources/Private/Templates/Search/Main.html
@@ -38,10 +38,22 @@
 
     <!-- Fulltext switch -->
     <f:if condition="{settings.fulltext}">
-        <f:form.radio property="fulltext" value="0" id="tx-dlf-search-fulltext-no-{viewData.uniqueId}" class="tx-dlf-search-fulltext" checked="{lastSearch.fulltext} == 0" />
-        <label for="tx-dlf-search-fulltext-no-{viewData.uniqueId}"><f:translate key="search.inMetadata"/></label>
-        <f:form.radio property="fulltext" value="1" id="tx-dlf-search-fulltext-yes-{viewData.uniqueId}" class="tx-dlf-search-fulltext-yes" checked="{lastSearch.fulltext} == 1" />
-        <label for="tx-dlf-search-fulltext-yes-{viewData.uniqueId}"><f:translate key="search.inFulltext"/></label>
+        <f:comment><!-- needs to be written like this, to check if fulltext searchparam == NULL --></f:comment>
+        <f:if condition="{lastSearch.fulltext} ==">
+            <f:then>
+                <f:form.radio property="fulltext" value="0" id="tx-dlf-search-fulltext-no-{viewData.uniqueId}" class="tx-dlf-search-fulltext" checked="{settings.fulltextPreselect} == 0" />
+                <label for="tx-dlf-search-fulltext-no-{viewData.uniqueId}"><f:translate key="search.inMetadata"/></label>
+                <f:form.radio property="fulltext" value="1" id="tx-dlf-search-fulltext-yes-{viewData.uniqueId}" class="tx-dlf-search-fulltext-yes" checked="{settings.fulltextPreselect} == 1" />
+                <label for="tx-dlf-search-fulltext-yes-{viewData.uniqueId}"><f:translate key="search.inFulltext"/></label>
+            </f:then>
+            <f:comment><!-- as soon we have a user preference, we use it instead --></f:comment>
+            <f:else>
+                <f:form.radio property="fulltext" value="0" id="tx-dlf-search-fulltext-no-{viewData.uniqueId}" class="tx-dlf-search-fulltext" checked="{lastSearch.fulltext} == 0" />
+                <label for="tx-dlf-search-fulltext-no-{viewData.uniqueId}"><f:translate key="search.inMetadata"/></label>
+                <f:form.radio property="fulltext" value="1" id="tx-dlf-search-fulltext-yes-{viewData.uniqueId}" class="tx-dlf-search-fulltext-yes" checked="{lastSearch.fulltext} == 1" />
+                <label for="tx-dlf-search-fulltext-yes-{viewData.uniqueId}"><f:translate key="search.inFulltext"/></label>
+            </f:else>
+        </f:if>
     </f:if>
 
     <f:comment><!-- Add list of collections as parameter when configured in search plugin --></f:comment>