@@ -16,8 +16,7 @@ discard block |
||
| 16 | 16 | |
| 17 | 17 | use TYPO3\CMS\Core\Utility\GeneralUtility; |
| 18 | 18 | |
| 19 | -abstract class AbstractSearchController extends \EWW\Dpf\Controller\AbstractController |
|
| 20 | -{ |
|
| 19 | +abstract class AbstractSearchController extends \EWW\Dpf\Controller\AbstractController { |
|
| 21 | 20 | // search terms |
| 22 | 21 | private static $terms = ['_id', 'OWNER_ID', 'submitter', 'project']; |
| 23 | 22 | |
@@ -29,8 +28,7 @@ discard block |
||
| 29 | 28 | * @param array $query elasticsearch search query |
| 30 | 29 | * @return array results |
| 31 | 30 | */ |
| 32 | - public function getResultList($query, $type) |
|
| 33 | - { |
|
| 31 | + public function getResultList($query, $type) { |
|
| 34 | 32 | |
| 35 | 33 | $elasticSearch = new \EWW\Dpf\Services\ElasticSearch(); |
| 36 | 34 | $results = $elasticSearch->search($query, $type); |
@@ -43,8 +41,7 @@ discard block |
||
| 43 | 41 | * @param string $searchString |
| 44 | 42 | * @return array query |
| 45 | 43 | */ |
| 46 | - public function searchFulltext($searchString) |
|
| 47 | - { |
|
| 44 | + public function searchFulltext($searchString) { |
|
| 48 | 45 | // don't return query if searchString is empty |
| 49 | 46 | if (empty($searchString)) { |
| 50 | 47 | return null; |
@@ -67,8 +64,7 @@ discard block |
||
| 67 | 64 | * build array for elasticsearch |
| 68 | 65 | * @return array Elasticsearch query array |
| 69 | 66 | */ |
| 70 | - public function extendedSearch($searchArray = array()) |
|
| 71 | - { |
|
| 67 | + public function extendedSearch($searchArray = array()) { |
|
| 72 | 68 | |
| 73 | 69 | $query = array(); |
| 74 | 70 | $filter = array(); |
@@ -115,8 +111,7 @@ discard block |
||
| 115 | 111 | * @param array Elasticsearch query array |
| 116 | 112 | * @return array Elasticsearch queryFilter array |
| 117 | 113 | */ |
| 118 | - public function resultsFilter($query, $showDeleted = false) |
|
| 119 | - { |
|
| 114 | + public function resultsFilter($query, $showDeleted = false) { |
|
| 120 | 115 | |
| 121 | 116 | $queryFilter = array(); |
| 122 | 117 | |
@@ -200,8 +195,7 @@ discard block |
||
| 200 | 195 | * @param bool $intervalEnd Fills missing values with the maximum possible date if true |
| 201 | 196 | * @return DateTime Determined date |
| 202 | 197 | */ |
| 203 | - public function convertFormDate($dateString, $intervalEnd = false) |
|
| 204 | - { |
|
| 198 | + public function convertFormDate($dateString, $intervalEnd = false) { |
|
| 205 | 199 | try { |
| 206 | 200 | if (strlen($dateString) == 4) { |
| 207 | 201 | // assuming year |
@@ -222,8 +216,7 @@ discard block |
||
| 222 | 216 | * @param $string |
| 223 | 217 | * @return mixed |
| 224 | 218 | */ |
| 225 | - private function escapeQuery($string) |
|
| 226 | - { |
|
| 219 | + private function escapeQuery($string) { |
|
| 227 | 220 | $luceneReservedCharacters = preg_quote('+-&|!(){}[]^"~?:\\'); |
| 228 | 221 | $string = preg_replace_callback( |
| 229 | 222 | '/([' . $luceneReservedCharacters . '])/', |
@@ -241,8 +234,7 @@ discard block |
||
| 241 | 234 | * @param $date |
| 242 | 235 | * @return string |
| 243 | 236 | */ |
| 244 | - public function formatDate($date) |
|
| 245 | - { |
|
| 237 | + public function formatDate($date) { |
|
| 246 | 238 | // convert date from dd.mm.yyy to yyyy-dd-mm |
| 247 | 239 | $date = explode(".", $date); |
| 248 | 240 | return $date[2] . '-' . $date[1] . '-' . $date[0]; |