@@ -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(); |
@@ -113,8 +109,7 @@ discard block |
||
| 113 | 109 | * @param array Elasticsearch query array |
| 114 | 110 | * @return array Elasticsearch queryFilter array |
| 115 | 111 | */ |
| 116 | - public function resultsFilter($query, $showDeleted = false) |
|
| 117 | - { |
|
| 112 | + public function resultsFilter($query, $showDeleted = false) { |
|
| 118 | 113 | |
| 119 | 114 | $queryFilter = array(); |
| 120 | 115 | |
@@ -190,8 +185,7 @@ discard block |
||
| 190 | 185 | * @param $date |
| 191 | 186 | * @param bool $fillMax: fills missing values with the maximum possible date if true |
| 192 | 187 | */ |
| 193 | - public function convertFormDate($date, $fillMax = false) |
|
| 194 | - { |
|
| 188 | + public function convertFormDate($date, $fillMax = false) { |
|
| 195 | 189 | if (strlen($dateString) == 4) { |
| 196 | 190 | $year = $dateString; |
| 197 | 191 | $month = $fillMax ? "12" : "01"; |
@@ -207,8 +201,7 @@ discard block |
||
| 207 | 201 | * @param $string |
| 208 | 202 | * @return mixed |
| 209 | 203 | */ |
| 210 | - private function escapeQuery($string) |
|
| 211 | - { |
|
| 204 | + private function escapeQuery($string) { |
|
| 212 | 205 | $luceneReservedCharacters = preg_quote('+-&|!(){}[]^"~?:\\'); |
| 213 | 206 | $string = preg_replace_callback( |
| 214 | 207 | '/([' . $luceneReservedCharacters . '])/', |
@@ -226,8 +219,7 @@ discard block |
||
| 226 | 219 | * @param $date |
| 227 | 220 | * @return string |
| 228 | 221 | */ |
| 229 | - public function formatDate($date) |
|
| 230 | - { |
|
| 222 | + public function formatDate($date) { |
|
| 231 | 223 | // convert date from dd.mm.yyy to yyyy-dd-mm |
| 232 | 224 | $date = explode(".", $date); |
| 233 | 225 | return $date[2] . '-' . $date[1] . '-' . $date[0]; |