TASK: Add missing check for removed and hidden nodes in Driver 2.x

dfeyer · dfeyer · commit 5e2bd3324218 · 2017-02-10T23:29:30.000+01:00
diff --git a/Classes/Flowpack/ElasticSearch/ContentRepositoryAdaptor/Driver/Version2/IndexerDriver.php b/Classes/Flowpack/ElasticSearch/ContentRepositoryAdaptor/Driver/Version2/IndexerDriver.php
@@ -127,8 +127,10 @@ public function fulltext(NodeInterface $node, array $fulltextIndexOfNode, $targe
                             ctx._source.__fulltextParts = new HashMap();
                         }
                         
-                        if (fulltext.size() == 0) {
-                            ctx._source.__fulltextParts.remove(identifier);
+                        if (nodeIsRemoved || nodeIsHidden || fulltext.size() == 0) {
+                            if (ctx._source.__fulltextParts.containsKey(identifier)) {
+                                ctx._source.__fulltextParts.remove(identifier);
+                            }
                         } else {
                             ctx._source.__fulltextParts.put(identifier, fulltext);
                         }

Original file line number	Diff line number	Diff line change
`@@ -127,8 +127,10 @@ public function fulltext(NodeInterface $node, array $fulltextIndexOfNode, $targe`
`127`	`127`	`ctx._source.__fulltextParts = new HashMap();`
`128`	`128`	`}`
`129`	`129`
`130`		`- if (fulltext.size() == 0) {`
`131`		`- ctx._source.__fulltextParts.remove(identifier);`
	`130`	`+ if (nodeIsRemoved \|\| nodeIsHidden \|\| fulltext.size() == 0) {`
	`131`	`+ if (ctx._source.__fulltextParts.containsKey(identifier)) {`
	`132`	`+ ctx._source.__fulltextParts.remove(identifier);`
	`133`	`+ }`
`132`	`134`	`} else {`
`133`	`135`	`ctx._source.__fulltextParts.put(identifier, fulltext);`
`134`	`136`	`}`