kitodo / kitodo-publication

Classes/Controller/AbstractSearchController.php

Spacing +18 added lines, -18 removed lines

@@ -67,21 +67,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') {
 
@@ -98,7 +98,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));
 
         }
 
@@ -116,19 +116,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();
                 };
@@ -136,7 +136,7 @@ 
             }
 
             // add date filter
-            $dateFilter = array();
+            $dateFilter = array ();
             if ($searchResultsFilter['from']) {
 
                 $from     = date('d.m.Y', $searchResultsFilter['from']);
@@ -148,7 +148,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']);
@@ -157,14 +157,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));
                 }
 
             }
@@ -172,7 +172,7 @@ 
         }
 
         // document must be active
-        if($showDeleted == false) {
+        if ($showDeleted == false) {
 
             $queryFilter['body']['query']['bool']['must'][]['term']['STATE'] = 'A';
 
@@ -212,7 +212,7 @@ 
         $luceneReservedCharacters = preg_quote('+-&|!(){}[]^"~?:\\');
         $string                   = preg_replace_callback(
             '/([' . $luceneReservedCharacters . '])/',
-            function ($matches) {
+            function($matches) {
                 return '\\' . $matches[0];
             },
             $string

Braces +8 added lines, -16 removed lines

@@ -16,8 +16,7 @@ 
 
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 
-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'];
 
@@ -29,8 +28,7 @@ 
      * @param  array $query elasticsearch search query
      * @return array        results
      */
-    public function getResultList($query, $type)
-    {
+    public function getResultList($query, $type) {
 
         $elasticSearch = new \EWW\Dpf\Services\ElasticSearch();
         $results = $elasticSearch->search($query, $type);
@@ -43,8 +41,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;
@@ -67,8 +64,7 @@ 
      * build array for elasticsearch
      * @return array Elasticsearch query array
      */
-    public function extendedSearch($searchArray = array())
-    {
+    public function extendedSearch($searchArray = array()) {
 
         $query  = array();
         $filter = array();
@@ -115,8 +111,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();
 
@@ -200,8 +195,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
@@ -222,8 +216,7 @@ 
      * @param $string
      * @return mixed
      */
-    private function escapeQuery($string)
-    {
+    private function escapeQuery($string) {
         $luceneReservedCharacters = preg_quote('+-&|!(){}[]^"~?:\\');
         $string                   = preg_replace_callback(
             '/([' . $luceneReservedCharacters . '])/',
@@ -241,8 +234,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];

Upper-Lower-Casing +11 added lines, -11 removed lines

@@ -47,7 +47,7 @@ 
     {
         // don't return query if searchString is empty
         if (empty($searchString)) {
-            return null;
+            return NULL;
         }
 
         $searchString = $this->escapeQuery(trim($searchString));
@@ -57,7 +57,7 @@ 
         $query['body']['query']['bool']['minimum_should_match'] = "1"; // 1
         $query['body']['query']['bool']['should'][1]['has_child']['child_type'] = "datastream"; // 1
 
-        $query = $this->resultsFilter($query, false);
+        $query = $this->resultsFilter($query, FALSE);
 
         return $query;
 
@@ -85,13 +85,13 @@ 
 
             } elseif (!empty($qry) && $key == 'from') {
 
-                if ($dateTime = $this->convertFormDate($qry, false)) {
+                if ($dateTime = $this->convertFormDate($qry, FALSE)) {
                     $filter['gte'] = $dateTime->format('Y-m-d');
                 }
 
             } elseif (!empty($qry) && $key == 'till') {
 
-                if ($dateTime = $this->convertFormDate($qry, true)) {
+                if ($dateTime = $this->convertFormDate($qry, TRUE)) {
                     $filter['lte'] = $dateTime->format('Y-m-d');
                 }
 
@@ -104,7 +104,7 @@ 
 
         }
 
-        $showDeleted = ($searchArray['showDeleted'] == 'true') ? true : false;
+        $showDeleted = ($searchArray['showDeleted'] == 'true') ? TRUE : FALSE;
         $query = $this->resultsFilter($query, $showDeleted);
         return $query;
 
@@ -115,7 +115,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();
@@ -142,7 +142,7 @@ 
             if ($searchResultsFilter['from']) {
 
                 $from     = date('d.m.Y', $searchResultsFilter['from']);
-                $dateTime = $this->convertFormDate($from, false);
+                $dateTime = $this->convertFormDate($from, FALSE);
                 $dateFilter['gte'] = $dateTime->format('Y-m-d');
                 unset($searchResultsFilter['from']);
 
@@ -151,7 +151,7 @@ 
             if ($searchResultsFilter['till']) {
 
                 $till          = date('d.m.Y', $searchResultsFilter['till']);
-                $dateTime = $this->convertFormDate($till, true);
+                $dateTime = $this->convertFormDate($till, TRUE);
                 $dateFilter['lte'] = $dateTime->format('Y-m-d');
                 unset($searchResultsFilter['till']);
 
@@ -174,7 +174,7 @@ 
         }
 
         // document must be active
-        if($showDeleted == false) {
+        if($showDeleted == FALSE) {
 
             $queryFilter['body']['query']['bool']['must'][]['term']['STATE'] = 'A';
 
@@ -200,7 +200,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) {
@@ -213,7 +213,7 @@ 
                 return new \DateTime($dateString);
             }
         } catch (Exception $_) {
-            return false;
+            return FALSE;
         }
     }