kitodo / kitodo-publication

Classes/Controller/AbstractSearchController.php

Spacing +19 added lines, -19 removed lines

@@ -36,7 +36,7 @@ 
                 $client = $this->clientRepository->findAll()->current();
             }
             if (!$client) {
-                $this->redirect('list','Document');
+                $this->redirect('list', 'Document');
             } else {
             }
         }
@@ -85,21 +85,21 @@ 
      * build array for elasticsearch
      * @return array Elasticsearch query array
      */
-    public function extendedSearch($searchArray = array())
+    public function extendedSearch($searchArray = array ())
     {
 
-        $query  = array();
-        $filter = array();
+        $query  = array ();
+        $filter = array ();
         foreach ($searchArray as $key => $qry) {
             $qry = trim($qry);
 
             if (!empty($qry) && in_array($key, self::$matches)) {
 
-                $query['body']['query']['bool']['must'][] = array('match' => array($key => $qry));
+                $query['body']['query']['bool']['must'][] = array ('match' => array ($key => $qry));
 
             } elseif (!empty($qry) && in_array($key, self::$terms)) {
 
-                $query['body']['query']['bool']['must'][] = array('term' => array($key => $qry));
+                $query['body']['query']['bool']['must'][] = array ('term' => array ($key => $qry));
 
             } elseif (!empty($qry) && $key == 'from') {
 
@@ -118,7 +118,7 @@ 
 
         if (isset($filter['gte']) || isset($filter['lte'])) {
 
-            $query['body']['query']['bool']['must'][] = array('range' => array('distribution_date' => $filter));
+            $query['body']['query']['bool']['must'][] = array ('range' => array ('distribution_date' => $filter));
 
         }
 
@@ -136,19 +136,19 @@ 
     public function resultsFilter($query, $showDeleted = false)
     {
 
-        $queryFilter = array();
+        $queryFilter = array ();
 
         // Frontend only
         $searchResultsFilter = $this->settings['searchResultsFilter'];
-        if(!empty($searchResultsFilter)) {
+        if (!empty($searchResultsFilter)) {
 
             // add doctypes
-            if($searchResultsFilter['doctype']) {
+            if ($searchResultsFilter['doctype']) {
 
                 $uids = \TYPO3\CMS\Core\Utility\GeneralUtility::trimExplode(',', $searchResultsFilter['doctype']);
                 $documentTypeRepository = $this->documentTypeRepository;
-                $documentTypes = array();
-                foreach($uids as $uid) {
+                $documentTypes = array ();
+                foreach ($uids as $uid) {
                     $documentType = $documentTypeRepository->findByUid($uid);
                     $documentTypes[] = $documentType->getName();
                 };
@@ -156,7 +156,7 @@ 
             }
 
             // add date filter
-            $dateFilter = array();
+            $dateFilter = array ();
             if ($searchResultsFilter['from']) {
 
                 $from     = date('d.m.Y', $searchResultsFilter['from']);
@@ -168,7 +168,7 @@ 
 
             if ($searchResultsFilter['till']) {
 
-                $till          = date('d.m.Y', $searchResultsFilter['till']);
+                $till = date('d.m.Y', $searchResultsFilter['till']);
                 $dateTime = $this->convertFormDate($till, true);
                 $dateFilter['lte'] = $dateTime->format('Y-m-d');
                 unset($searchResultsFilter['till']);
@@ -177,14 +177,14 @@ 
 
             if (isset($dateFilter['gte']) || isset($dateFilter['lte'])) {
 
-                $queryFilter['body']['query']['bool']['must'][] = array('range' => array('distribution_date' => $dateFilter));
+                $queryFilter['body']['query']['bool']['must'][] = array ('range' => array ('distribution_date' => $dateFilter));
 
             }
 
             foreach ($searchResultsFilter as $key => $qry) {
 
-                if(!empty($qry)) {
-                    $queryFilter['body']['query']['bool']['must'][] = array('match' => array($key => $qry));
+                if (!empty($qry)) {
+                    $queryFilter['body']['query']['bool']['must'][] = array ('match' => array ($key => $qry));
                 }
 
             }
@@ -192,7 +192,7 @@ 
         }
 
         // document must be active
-        if($showDeleted == false) {
+        if ($showDeleted == false) {
 
             $queryFilter['body']['query']['bool']['must'][]['term']['STATE'] = 'A';
 
@@ -250,7 +250,7 @@ 
         $luceneReservedCharacters = preg_quote('+-&|!(){}[]^"~?:\\');
         $string                   = preg_replace_callback(
             '/([' . $luceneReservedCharacters . '])/',
-            function ($matches) {
+            function($matches) {
                 return '\\' . $matches[0];
             },
             $string

Braces +9 added lines, -18 removed lines

@@ -17,8 +17,7 @@ 
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 use EWW\Dpf\Services\ElasticSearch;
 
-abstract class AbstractSearchController extends \EWW\Dpf\Controller\AbstractController
-{
+abstract class AbstractSearchController extends \EWW\Dpf\Controller\AbstractController {
     // search terms
     private static $terms   = ['_id', 'OWNER_ID', 'submitter', 'project'];
 
@@ -26,8 +25,7 @@ 
     private static $matches = ['title', 'abstract', 'author', 'language', 'tag', 'corporation', 'doctype', 'collections'];
 
 
-    protected function initializeView(\TYPO3\CMS\Extbase\Mvc\View\ViewInterface $view)
-    {
+    protected function initializeView(\TYPO3\CMS\Extbase\Mvc\View\ViewInterface $view) {
         parent::initializeView($view);
 
         if (TYPO3_MODE === 'BE') {
@@ -47,8 +45,7 @@ 
      * @param  array $query elasticsearch search query
      * @return array        results
      */
-    public function getResultList($query, $type)
-    {
+    public function getResultList($query, $type) {
 
         $elasticSearch = $this->objectManager->get(ElasticSearch::class);
         $results = $elasticSearch->search($query, $type);
@@ -61,8 +58,7 @@ 
      * @param  string $searchString
      * @return array query
      */
-    public function searchFulltext($searchString)
-    {
+    public function searchFulltext($searchString) {
         // don't return query if searchString is empty
         if (empty($searchString)) {
             return null;
@@ -85,8 +81,7 @@ 
      * build array for elasticsearch
      * @return array Elasticsearch query array
      */
-    public function extendedSearch($searchArray = array())
-    {
+    public function extendedSearch($searchArray = array()) {
 
         $query  = array();
         $filter = array();
@@ -133,8 +128,7 @@ 
      * @param array Elasticsearch query array
      * @return array Elasticsearch queryFilter array
      */
-    public function resultsFilter($query, $showDeleted = false)
-    {
+    public function resultsFilter($query, $showDeleted = false) {
 
         $queryFilter = array();
 
@@ -223,8 +217,7 @@ 
      * @param  bool      $intervalEnd Fills missing values with the maximum possible date if true
      * @return DateTime               Determined date
      */
-    public function convertFormDate($dateString, $intervalEnd = false)
-    {
+    public function convertFormDate($dateString, $intervalEnd = false) {
         try {
             if (strlen($dateString) == 4) {
                 // assuming year
@@ -245,8 +238,7 @@ 
      * @param $string
      * @return mixed
      */
-    private function escapeQuery($string)
-    {
+    private function escapeQuery($string) {
         $luceneReservedCharacters = preg_quote('+-&|!(){}[]^"~?:\\');
         $string                   = preg_replace_callback(
             '/([' . $luceneReservedCharacters . '])/',
@@ -264,8 +256,7 @@ 
      * @param $date
      * @return string
      */
-    public function formatDate($date)
-    {
+    public function formatDate($date) {
         // convert date from dd.mm.yyy to yyyy-dd-mm
         $date = explode(".", $date);
         return $date[2] . '-' . $date[1] . '-' . $date[0];