Merge branch 'test' into dev

slub · Nov 12, 2024 · 9371f8d · 9371f8d
2 parents 21d4a79 + 99a018d
commit 9371f8d
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 8 deletions.
diff --git a/Classes/Common/ElasticClientBuilder.php b/Classes/Common/ElasticClientBuilder.php
@@ -59,14 +59,14 @@ protected function autoconfig (): ElasticClientBuilder {
 
     private function setCaFilePath(): void
     {
-        if ($this->extConf->get('elasticCaFileName') == '') {
+        if ($this->extConf->get('elasticCaFileFilePath') == '') {
             $this->caFilePath = '';
             return;
         }
 
         $this->caFilePath = $this->extConf->
             sortKeysDesc()->
-            only('elasticCredentialsFilePath', 'elasticCaFileName')->
+            only('elasticCredentialsFilePath', 'elasticCaFileFilePath')->
             implode('/');
     }
 

diff --git a/Classes/Common/QueryParamsBuilder.php b/Classes/Common/QueryParamsBuilder.php
@@ -2,18 +2,27 @@
 
 namespace Slub\LisztCommon\Common;
 
+use TYPO3\CMS\Core\Configuration\ExtensionConfiguration;
+use TYPO3\CMS\Core\Utility\GeneralUtility;
+
 class QueryParamsBuilder
 {
 
     //Todo: get Config for bibIndex, aggs etc. from extension config?
-    public static function createElasticParams(string $bibIndex, array $searchParams): array
+    public static function createElasticParams(array $searchParams): array
     {
+        $extConf = GeneralUtility::makeInstance(ExtensionConfiguration::class)->get('liszt_bibliography');
+        $bibIndex = $extConf['elasticIndexName'];
+        $aggs = []; // TYPOSCRIPT stuff here
+
         $params = [
             'index' => $bibIndex,
             'body' => [
                 'size' => 10,
                 '_source' => ['itemType', 'tx_lisztcommon_header', 'tx_lisztcommon_body', 'tx_lisztcommon_footer'],
-                'aggs' => [
+                //'aggs' => $aggs
+                'aggs' =>
+                [
                     'itemType' => [
                         'terms' => [
                             'field' => 'itemType.keyword',
@@ -28,6 +37,16 @@ public static function createElasticParams(string $bibIndex, array $searchParams
                         'terms' => [
                             'field' => 'date.keyword',
                         ]
+                    ],
+                    'language' => [
+                        'terms' => [
+                            'field' => 'language.keyword',
+                        ]
+                    ],
+                    'journalTitle' => [
+                        'terms' => [
+                            'field' => 'publicationTitle.keyword',
+                        ]
                     ]
                 ]
             ]

diff --git a/Classes/Services/ElasticSearchService.php b/Classes/Services/ElasticSearchService.php
@@ -41,17 +41,14 @@ public function getElasticInfo(): array
         return ($this->client->info()->asArray());
     }
 
-
-
     public function search($searchParams): Collection
     {
         $this->init();
-        $this->params = QueryParamsBuilder::createElasticParams($this->bibIndex, $searchParams);
+        $this->params = QueryParamsBuilder::createElasticParams($searchParams);
 
         // ToDo: handle exceptions!
         $response = $this->client->search($this->params);
         return new Collection($response->asArray());
     }
 
-
 }