@@ -17,8 +17,7 @@ discard block |
||
| 17 | 17 | use TYPO3\CMS\Core\Utility\GeneralUtility; |
| 18 | 18 | use EWW\Dpf\Services\ElasticSearch; |
| 19 | 19 | |
| 20 | -abstract class AbstractSearchController extends \EWW\Dpf\Controller\AbstractController |
|
| 21 | -{ |
|
| 20 | +abstract class AbstractSearchController extends \EWW\Dpf\Controller\AbstractController { |
|
| 22 | 21 | // search terms |
| 23 | 22 | private static $terms = ['_id', 'OWNER_ID', 'submitter', 'project']; |
| 24 | 23 | |
@@ -26,8 +25,7 @@ discard block |
||
| 26 | 25 | private static $matches = ['title', 'abstract', 'author', 'language', 'tag', 'corporation', 'doctype', 'collections']; |
| 27 | 26 | |
| 28 | 27 | |
| 29 | - protected function initializeView(\TYPO3\CMS\Extbase\Mvc\View\ViewInterface $view) |
|
| 30 | - { |
|
| 28 | + protected function initializeView(\TYPO3\CMS\Extbase\Mvc\View\ViewInterface $view) { |
|
| 31 | 29 | parent::initializeView($view); |
| 32 | 30 | |
| 33 | 31 | if (TYPO3_MODE === 'BE') { |
@@ -47,8 +45,7 @@ discard block |
||
| 47 | 45 | * @param array $query elasticsearch search query |
| 48 | 46 | * @return array results |
| 49 | 47 | */ |
| 50 | - public function getResultList($query, $type) |
|
| 51 | - { |
|
| 48 | + public function getResultList($query, $type) { |
|
| 52 | 49 | |
| 53 | 50 | $elasticSearch = $this->objectManager->get(ElasticSearch::class); |
| 54 | 51 | $results = $elasticSearch->search($query, $type); |
@@ -61,8 +58,7 @@ discard block |
||
| 61 | 58 | * @param string $searchString |
| 62 | 59 | * @return array query |
| 63 | 60 | */ |
| 64 | - public function searchFulltext($searchString) |
|
| 65 | - { |
|
| 61 | + public function searchFulltext($searchString) { |
|
| 66 | 62 | // don't return query if searchString is empty |
| 67 | 63 | if (empty($searchString)) { |
| 68 | 64 | return null; |
@@ -85,8 +81,7 @@ discard block |
||
| 85 | 81 | * build array for elasticsearch |
| 86 | 82 | * @return array Elasticsearch query array |
| 87 | 83 | */ |
| 88 | - public function extendedSearch($searchArray = array()) |
|
| 89 | - { |
|
| 84 | + public function extendedSearch($searchArray = array()) { |
|
| 90 | 85 | |
| 91 | 86 | $query = array(); |
| 92 | 87 | $filter = array(); |
@@ -133,8 +128,7 @@ discard block |
||
| 133 | 128 | * @param array Elasticsearch query array |
| 134 | 129 | * @return array Elasticsearch queryFilter array |
| 135 | 130 | */ |
| 136 | - public function resultsFilter($query, $showDeleted = false) |
|
| 137 | - { |
|
| 131 | + public function resultsFilter($query, $showDeleted = false) { |
|
| 138 | 132 | |
| 139 | 133 | $queryFilter = array(); |
| 140 | 134 | |
@@ -223,8 +217,7 @@ discard block |
||
| 223 | 217 | * @param bool $intervalEnd Fills missing values with the maximum possible date if true |
| 224 | 218 | * @return DateTime Determined date |
| 225 | 219 | */ |
| 226 | - public function convertFormDate($dateString, $intervalEnd = false) |
|
| 227 | - { |
|
| 220 | + public function convertFormDate($dateString, $intervalEnd = false) { |
|
| 228 | 221 | try { |
| 229 | 222 | if (strlen($dateString) == 4) { |
| 230 | 223 | // assuming year |
@@ -245,8 +238,7 @@ discard block |
||
| 245 | 238 | * @param $string |
| 246 | 239 | * @return mixed |
| 247 | 240 | */ |
| 248 | - private function escapeQuery($string) |
|
| 249 | - { |
|
| 241 | + private function escapeQuery($string) { |
|
| 250 | 242 | $luceneReservedCharacters = preg_quote('+-&|!(){}[]^"~?:\\'); |
| 251 | 243 | $string = preg_replace_callback( |
| 252 | 244 | '/([' . $luceneReservedCharacters . '])/', |
@@ -264,8 +256,7 @@ discard block |
||
| 264 | 256 | * @param $date |
| 265 | 257 | * @return string |
| 266 | 258 | */ |
| 267 | - public function formatDate($date) |
|
| 268 | - { |
|
| 259 | + public function formatDate($date) { |
|
| 269 | 260 | // convert date from dd.mm.yyy to yyyy-dd-mm |
| 270 | 261 | $date = explode(".", $date); |
| 271 | 262 | return $date[2] . '-' . $date[1] . '-' . $date[0]; |