[BUGFIX] Direct indexing of nodes broken

kdambekalns · kdambekalns · commit 4d32875b485a · 2014-04-15T19:08:40.000+02:00
The fix in pull request 25 broke direct indexing (that is, indexing from
the live workspace using node index:build).
diff --git a/Classes/Flowpack/ElasticSearch/ContentRepositoryAdaptor/Indexer/NodeIndexingManager.php b/Classes/Flowpack/ElasticSearch/ContentRepositoryAdaptor/Indexer/NodeIndexingManager.php
@@ -115,10 +115,10 @@ public function flushQueues() {
 		/** @var \TYPO3\TYPO3CR\Domain\Model\NodeInterface $nodeToBeIndexed  */
 		foreach ($this->nodesToBeIndexed as $nodeToBeIndexed) {
 			if (!isset($this->targetWorkspaceNamesForNodesToBeIndexed[$nodeToBeIndexed->getContextPath()])) {
-				// No target workspace for indexing found
-				continue;
+				$this->nodeIndexer->indexNode($nodeToBeIndexed);
+			} else {
+				$this->nodeIndexer->indexNode($nodeToBeIndexed, $this->targetWorkspaceNamesForNodesToBeIndexed[$nodeToBeIndexed->getWorkspace()->getName()]);
 			}
-			$this->nodeIndexer->indexNode($nodeToBeIndexed, $this->targetWorkspaceNamesForNodesToBeIndexed[$nodeToBeIndexed->getWorkspace()->getName()]);
 		}
 
 		foreach ($this->nodesToBeRemoved as $nodeToBeRemoved) {

Original file line number	Diff line number	Diff line change
`@@ -115,10 +115,10 @@ public function flushQueues() {`
`115`	`115`	`/** @var \TYPO3\TYPO3CR\Domain\Model\NodeInterface $nodeToBeIndexed */`
`116`	`116`	`foreach ($this->nodesToBeIndexed as $nodeToBeIndexed) {`
`117`	`117`	`if (!isset($this->targetWorkspaceNamesForNodesToBeIndexed[$nodeToBeIndexed->getContextPath()])) {`
`118`		`- // No target workspace for indexing found`
`119`		`- continue;`
	`118`	`+ $this->nodeIndexer->indexNode($nodeToBeIndexed);`
	`119`	`+ } else {`
	`120`	`+ $this->nodeIndexer->indexNode($nodeToBeIndexed, $this->targetWorkspaceNamesForNodesToBeIndexed[$nodeToBeIndexed->getWorkspace()->getName()]);`
`120`	`121`	`}`
`121`		`- $this->nodeIndexer->indexNode($nodeToBeIndexed, $this->targetWorkspaceNamesForNodesToBeIndexed[$nodeToBeIndexed->getWorkspace()->getName()]);`
`122`	`122`	`}`
`123`	`123`
`124`	`124`	`foreach ($this->nodesToBeRemoved as $nodeToBeRemoved) {`