Catch deleteById() exceptions in ElasticSearch

Author: cdujeu

core/src/plugins/index.elasticsearch/src/ElasticSearchIndexer.php

@@ -272,7 +272,9 @@ public function applyAction(\Psr\Http\Message\ServerRequestInterface $requestInt
                 }
 
                 if (!file_exists($tmpNode->getUrl())) {
-                    $this->currentType->deleteById($hit->getId());
+                    try{
+                        $this->currentType->deleteById($hit->getId());
+                    }catch (Elastica\Exception\NotFoundException $nfe){}
                     continue;
                 }
 
@@ -333,7 +335,9 @@ public function applyAction(\Psr\Http\Message\ServerRequestInterface $requestInt
                     $tmpNode->loadNodeInfo();
                 }
                 if (!file_exists($tmpNode->getUrl())) {
-                    $this->currentType->deleteById($hit->getId());
+                    try{
+                        $this->currentType->deleteById($hit->getId());
+                    }catch (Elastica\Exception\NotFoundException $eEx){}
                     continue;
                 }
                 $tmpNode->search_score = sprintf("%0.2f", $hit->score);
@@ -392,12 +396,18 @@ public function updateNodeIndexMeta($node)
             foreach ($hits as $hit) {
                 $source = $hit->getSource();
                 if ($source['ajxp_scope'] == 'shared' || ($source['ajxp_scope'] == 'user' && $source['ajxp_user'] == $node->getContext()->getUser()->getId())) {
-                    $this->currentType->deleteById($hit->getId());
+                    try{
+                        $this->currentType->deleteById($hit->getId());
+                    }catch (Elastica\Exception\NotFoundException $eEx){}
                 }
             }
         } else {
             $id = $this->getIndexedDocumentId($node);
-            if($id != null) $this->currentType->deleteById($id);
+            if($id != null) {
+                try{
+                    $this->currentType->deleteById($id);
+                }catch (Elastica\Exception\NotFoundException $eEx){}
+            }
         }
         $this->createIndexedDocument($node);
 
@@ -433,7 +443,9 @@ public function updateNodeIndex($oldNode, $newNode = null, $copy = false, $recur
                     $childrenHits = $childrenHits->getResults();
 
                     foreach ($childrenHits as $hit) {
-                        $this->currentType->deleteById($hit->getId());
+                        try{
+                            $this->currentType->deleteById($hit->getId());
+                        }catch (Elastica\Exception\NotFoundException $eEx){}
                     }
                 }
             }
@@ -479,7 +491,9 @@ public function updateNodeIndex($oldNode, $newNode = null, $copy = false, $recur
                 foreach ($childrenHits as $hit) {
                     $oldChildURL = $this->currentType->getDocument($hit->getId())->get("node_url");
                     if ($copy == false) {
-                        $this->currentType->deleteById($hit->getId());
+                        try{
+                            $this->currentType->deleteById($hit->getId());
+                        }catch (Elastica\Exception\NotFoundException $eEx){}
                     }
                     $newChildURL = str_replace($oldNode->getUrl(),
                         $newNode->getUrl(),