Merge pull request #122 from XIMDEX/develop

Develop
XIMDEX · Jan 10, 2025 · 2fb559a · 2fb559a
2 parents 42e7fff + 343f5aa
commit 2fb559a
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 12 deletions.
diff --git a/backend/app/Services/ResourceService.php b/backend/app/Services/ResourceService.php
@@ -400,7 +400,7 @@ public function update(DamResource $resource, $params, $availableSizes): DamReso
                         $resource->data->description->semantic_tags
                     );
                 }*/
-                $this->setLomData($resource, $lom_params);
+               // $this->setLomData($resource, $lom_params);
             }
 
             $this->saveAssociatedFiles($resource, $params, $availableSizes);

diff --git a/backend/app/Services/Solr/SolrConfig.php b/backend/app/Services/Solr/SolrConfig.php
@@ -210,7 +210,12 @@ public function cleanDocuments(array $excludedCores, $action, $solrVersion): str
             //exclude cores
             $clientCoreName = $client->getEndpoint()->getOptions()['core'];
             $aliasClient = $this->getClientCoreAlias($clientCoreName);
-
+            if (!empty($solrVersion)) {
+                $aliasClient = array_map(function ($auxClientCoreNames, $clientName) use ($solrVersion) {
+                    return [$clientName . "_$solrVersion" => $auxClientCoreNames];
+                }, $aliasClient, array_keys($aliasClient));
+                $aliasClient = call_user_func_array('array_merge', $aliasClient);
+            }
             $isValid = false;
             foreach ($aliasClient[$clientCoreName] as $auxClientCoreName) {
                 $isValid = !$isValid && array_key_exists($auxClientCoreName, config('solarium.connections', []));

diff --git a/backend/app/Services/Solr/SolrService.php b/backend/app/Services/Solr/SolrService.php
@@ -227,15 +227,15 @@ public function saveOrUpdateDocument(
 
         // Checks if the LOM and the LOMES must be updated
         if ($reindexLOM) {
-            // Gets the LOM and the LOMES client
-            $lomClient = $this->getClient($lomCoreName);
-            $lomesClient = $this->getClient($lomesCoreName);
+       //     // Gets the LOM and the LOMES client
+            $lomClient = $this->getClient('lom');
+            $lomesClient = $this->getClient('lomes');
 
-            // Gets the LOM and the LOMES items
+       //     // Gets the LOM and the LOMES items
             $lomItem = Lom::where('dam_resource_id', $damResource->id)->first();
             $lomesItem = Lomes::where('dam_resource_id', $damResource->id)->first();
 
-            // Manages the LOM and LOMES documents
+       //     // Manages the LOM and LOMES documents
             $this->saveLOMDocuments($lomClient, $lomItem, Utils::getLomSchema(true), $damResource);
             $this->saveLOMDocuments($lomesClient, $lomesItem, Utils::getLomesSchema(true), $damResource);
         }
@@ -439,7 +439,6 @@ private function executeSearchQuery($pageParams = [], $sortParams = [], $facetsF
                 foreach ($fields['files'] as $file) {
                     $last_uuid = substr($file, strrpos($file, "@",-4));
                     $last_uuid= str_replace("@", "", $last_uuid);
-
                     if (Storage::disk("semantic")->exists($fields["id"]."/".$last_uuid.".json")) {
                         $json = json_decode(Storage::disk("semantic")->get($fields["id"]."/".$last_uuid.".json"));
                         if(isset($json->xtags_interlinked)){
@@ -477,12 +476,8 @@ private function executeSearchQuery($pageParams = [], $sortParams = [], $facetsF
                             $fields['data']->description->semantic_tags[$key] = $semanticData;
                         }
                      }
-
                 }
-
-
             }
-
             $documentsResponse[] = $fields;
         }