Merged branch '2.0' into 3.0

ezsystems · May 26, 2020 · 4afad97 · 4afad97
2 parents a5991db + 5b8f0eb
commit 4afad97
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 18 deletions.
diff --git a/composer.json b/composer.json
@@ -12,7 +12,7 @@
     ],
     "require": {
         "php": "^7.3",
-        "ezsystems/ezplatform-kernel": "~1.0.0@dev",
+        "ezsystems/ezplatform-kernel": "~1.0.3@dev",
         "netgen/query-translator": "^1.0.2",
         "symfony/http-kernel": "^5.0",
         "symfony/dependency-injection": "^5.0",

diff --git a/lib/FieldMapper/ContentFieldMapper/BlockDocumentsBaseContentFields.php b/lib/FieldMapper/ContentFieldMapper/BlockDocumentsBaseContentFields.php
@@ -125,7 +125,7 @@ public function mapFields(Content $content)
             new Field(
                 'content_remote_id',
                 $contentInfo->remoteId,
-                new FieldType\IdentifierField()
+                new FieldType\RemoteIdentifierField()
             ),
             new Field(
                 'content_modification_date',

diff --git a/lib/FieldMapper/ContentFieldMapper/ContentDocumentLocationFields.php b/lib/FieldMapper/ContentFieldMapper/ContentDocumentLocationFields.php
@@ -74,7 +74,7 @@ public function mapFields(Content $content)
             $fields[] = new Field(
                 'location_remote_id',
                 $locationData['remote_ids'],
-                new FieldType\MultipleIdentifierField()
+                new FieldType\MultipleRemoteIdentifierField()
             );
             $fields[] = new Field(
                 'location_path_string',
@@ -97,7 +97,7 @@ public function mapFields(Content $content)
             $fields[] = new Field(
                 'main_location_remote_id',
                 $mainLocation->remoteId,
-                new FieldType\IdentifierField()
+                new FieldType\RemoteIdentifierField()
             );
             $fields[] = new Field(
                 'main_location_visible',

diff --git a/lib/FieldMapper/LocationFieldMapper/LocationDocumentBaseFields.php b/lib/FieldMapper/LocationFieldMapper/LocationDocumentBaseFields.php
@@ -71,7 +71,7 @@ public function mapFields(Location $location)
             new Field(
                 'remote_id',
                 $location->remoteId,
-                new FieldType\IdentifierField()
+                new FieldType\RemoteIdentifierField()
             ),
             new Field(
                 'parent_id',

diff --git a/lib/Handler.php b/lib/Handler.php
@@ -5,8 +5,6 @@
  *
  * @copyright Copyright (C) eZ Systems AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
- *
- * @version //autogentag//
  */
 namespace EzSystems\EzPlatformSolrSearchEngine;
 
@@ -481,16 +479,8 @@ public function supports(int $capabilityFlag): bool
      */
     public function deleteTranslation(int $contentId, string $languageCode): void
     {
-        $idPrefix = $this->mapper->generateContentDocumentId($contentId, $this->sanitizeInput($languageCode));
-
-        $this->gateway->deleteByQuery("_root_:{$idPrefix}*");
-    }
-
-    /**
-     * Sanitize string before injecting into Search Engine query
-     */
-    protected function sanitizeInput(string $input): string
-    {
-        return preg_replace('([^A-Za-z0-9/]+)', '', $input);
+        $this->gateway->deleteByQuery(
+            "content_id_id:{$contentId} AND meta_indexed_language_code_s:{$languageCode}"
+        );
     }
 }