Merge pull request #4 from slub/going-kitodo-presentation-4

Make compatible with Kitodo.Presentation 4.0
slub · Mar 30, 2022 · ff24c52 · ff24c52
2 parents ea6dc29 + 0ae1926
commit ff24c52
Show file tree

Hide file tree

Showing 5 changed files with 91 additions and 132 deletions.
diff --git a/Classes/Controller/SearchController.php b/Classes/Controller/SearchController.php
@@ -33,7 +33,8 @@
 /**
  * Class SearchController
  */
-class SearchController extends AbstractController {
+class SearchController extends AbstractController
+{
 
     /**
      * searchRepository
@@ -48,7 +49,8 @@ class SearchController extends AbstractController {
      *
      * @return void
      */
-    public function listAction() {
+    public function listAction()
+    {
         $userUid = $this->user->getUid();
 
         $this->view->assignMultiple([
@@ -63,7 +65,8 @@ public function listAction() {
      *
      * @return void
      */
-    public function saveAction() {
+    public function saveAction()
+    {
 
     }
 
@@ -76,16 +79,16 @@ public function createAction()
     {
         if($this->user !==NULL && $this->user->getUid()) {
 
-            $searchParams = GeneralUtility::_GP('tx_dlf');
+            $searchParams = GeneralUtility::_GP('tx_dlf_search');
 
-            if(array_key_exists('query',$searchParams) && array_key_exists('fulltext',$searchParams)) {
+            if (is_array($searchParams) && array_key_exists('query',$searchParams['searchParameter']) && array_key_exists('fulltext',$searchParams['searchParameter'])) {
                 $arguments = $this->request->getArguments();
 
                 $searchRequest = new Search();
                 $title = $arguments['title'] ? $arguments['title'] : LocalizationUtility::translate('search', 'DigasFeManagement').': '.strftime('%d.%m.%y - %H:%M');
 
                 $searchRequest->setTitle($title);
-                $searchRequest->setSearchParams($searchParams);
+                $searchRequest->setSearchParams($searchParams['searchParameter']);
                 $searchRequest->setFeUser($this->user->getUid());
 
                 $this->searchRepository->add($searchRequest);
@@ -95,7 +98,7 @@ public function createAction()
                     'DigasFeManagement'
                 );
 
-                if(GeneralUtility::_GET('type')>0) {
+                if (GeneralUtility::_GET('type')>0) {
                     return $statusMessage;
                 }
 

diff --git a/Resources/Private/Extensions/slub_web_digas/Layouts/KitodoPage.html b/Resources/Private/Extensions/slub_web_digas/Layouts/KitodoPage.html
@@ -5,10 +5,6 @@
       data-namespace-typo3-fluid="true"
       lang="en">
 
-<dv:titleTag
-	title="<dc:xpath xpath='(//mets:dmdSec/mets:mdWrap/mets:xmlData/mods:mods/mods:titleInfo[not(@type=\"alternative\")]/mods:nonSort | //mets:dmdSec/mets:mdWrap/mets:xmlData/mods:mods/mods:titleInfo[not(@type=\"alternative\")]/mods:title | //mets:dmdSec/mets:mdWrap/mets:xmlData/mods:mods/mods:titleInfo[not(@type=\"alternative\")]/mods:partNumber | //mets:dmdSec/mets:mdWrap/mets:xmlData/mods:mods/mods:titleInfo[not(@type=\"alternative\")]/mods:partName)[1]' />"
-/>
-
     <f:comment>
         <!--
         check if access on certain document id is granted