Use viewData to get pid

kitodo · Aug 28, 2023 · beb2255 · beb2255
1 parent cae0ac4
commit beb2255
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 9 deletions.
diff --git a/Classes/Controller/ToolboxController.php b/Classes/Controller/ToolboxController.php
@@ -51,6 +51,7 @@ public function mainAction()
  }
 
  $this->renderTool();
+ $this->view->assign('viewData', $this->viewData);
  }
 
  /**
@@ -401,6 +402,7 @@ private function renderSearchInDocumentTool()
  'LABEL_QUERY_URL' => $this->settings['queryInputName'],
  'LABEL_START' => $this->settings['startInputName'],
  'LABEL_ID' => $this->settings['idInputName'],
+ 'LABEL_PID' => $this->settings['pidInputName'],
  'LABEL_PAGE_URL' => $this->settings['pageInputName'],
  'LABEL_HIGHLIGHT_WORD' => $this->settings['highlightWordInputName'],
  'LABEL_ENCRYPTED' => $this->settings['encryptedInputName'],

diff --git a/Classes/Eid/SearchInDocument.php b/Classes/Eid/SearchInDocument.php
@@ -90,18 +90,13 @@ public function main(ServerRequestInterface $request)
  $highlighting = $data['ocrHighlighting'];
 
  $siteFinder = GeneralUtility::makeInstance(SiteFinder::class);
- // TODO: find a way to get current pid
- // attribute routing is null
- //$pageId = $request->getAttribute('routing')->getPageId();
- $pid = $GLOBALS['TSFE']->id;
- $site = $siteFinder->getSiteByPageId(1);
+ $site = $siteFinder->getSiteByPageId($parameters['pid']);
 
  foreach ($result as $record) {
  $resultDocument = new ResultDocument($record, $highlighting, $fields);
-
- // TODO: find a way to get route (werkansicht)
+
  $url = (string) $site->getRouter()->generateUri(
- 8,
+ $parameters['pid'],
  [
  'tx_dlf[id]' => !empty($resultDocument->getUid()) ? $resultDocument->getUid() : $parameters['uid'],
  'tx_dlf[page]' => $resultDocument->getPage(),

diff --git a/Configuration/TypoScript/Toolbox/setup.typoscript b/Configuration/TypoScript/Toolbox/setup.typoscript
@@ -1,5 +1,6 @@
 plugin.tx_dlf_fulltexttool {
  settings {
+ tool = fulltexttool
  activateFullTextInitially = 0
  fullTextScrollElement = html, body
  searchHlParameters = tx_dlf[highlight_word]
@@ -8,9 +9,11 @@ plugin.tx_dlf_fulltexttool {
 
 plugin.tx_dlf_searchindocumenttool {
  settings {
+ tool = searchindocumenttool
  searchUrl =
  documentIdUrlSchema =
  idInputName = tx_dlf[id]
+ pidInputName = tx_dlf[pid]
  queryInputName = tx_dlf[query]
  startInputName = tx_dlf[start]
  pageInputName = tx_dlf[page]

diff --git a/Resources/Private/Templates/Toolbox/Main.html b/Resources/Private/Templates/Toolbox/Main.html
@@ -164,7 +164,7 @@
  <f:variable name="actionUrl" value="{settings.searchUrl}" />
  </f:then>
  <f:else>
- <f:variable name="actionUrl" value="{f:uri.page(pageUid='{viewData.requestData.pageUid}')}" />
+ <f:variable name="actionUrl" value="{f:uri.page(pageUid='{viewData.pageUid}')}" />
  </f:else>
  </f:if>
  <form class="tx-dlf-search-form" id="tx-dlf-search-in-document-form" action="{actionUrl}" method="get" enctype="multipart/form-data">
@@ -177,6 +177,7 @@
  <input type="submit" id="tx-dlf-search-in-document-button" value="{f:translate(key: 'search.submit')}" onclick="resetStart();" />
  <input type="hidden" id="tx-dlf-search-in-document-start" name="{searchInDocument.LABEL_START}" value="0" />
  <input type="hidden" id="tx-dlf-search-in-document-id" name="{searchInDocument.LABEL_ID}" value="{searchInDocument.CURRENT_DOCUMENT}" />
+ <input type="hidden" id="tx-dlf-search-in-document-pid" name="{searchInDocument.LABEL_PID}" value="{viewData.pageUid}" />
  <input type="hidden" id="tx-dlf-search-in-document-page" name="{searchInDocument.LABEL_PAGE_URL}" />
  <input type="hidden" id="tx-dlf-search-in-document-highlight-word" name="{searchInDocument.LABEL_HIGHLIGHT_WORD}" />
  <input type="hidden" id="tx-dlf-search-in-document-encrypted" name="{searchInDocument.LABEL_ENCRYPTED}" value="{searchInDocument.SOLR_ENCRYPTED}" />

diff --git a/Resources/Public/JavaScript/PageView/SearchInDocument.js b/Resources/Public/JavaScript/PageView/SearchInDocument.js
@@ -233,6 +233,7 @@ $(document).ready(function() {
  eID: "tx_dlf_search_in_document",
  q: $( "input[id='tx-dlf-search-in-document-query']" ).val(),
  uid: $( "input[id='tx-dlf-search-in-document-id']" ).val(),
+ pid: $( "input[id='tx-dlf-search-in-document-pid']" ).val(),
  start: $( "input[id='tx-dlf-search-in-document-start']" ).val(),
  encrypted: $( "input[id='tx-dlf-search-in-document-encrypted']" ).val(),
  },