Merge pull request #10 from Flowpack/fulltext-index-non-document-nodes

[BUGFIX] Enable fulltext indexing for non-document nodes

Author: Robert Lemke

Classes/Flowpack/ElasticSearch/ContentRepositoryAdaptor/Indexer/NodeIndexer.php

@@ -294,6 +294,7 @@ protected function updateFulltext(NodeData $nodeData, array $fulltextIndexOfNode
 			$closestFulltextNode = $closestFulltextNode->getParent();
 			if ($closestFulltextNode === NULL) {
 				// root of hierarchy, no fulltext root found anymore, abort silently...
+				$this->logger->log('No fulltext root found for ' . $nodeData->getPath(), LOG_WARNING);
 				return;
 			}
 		}
@@ -317,7 +318,11 @@ protected function updateFulltext(NodeData $nodeData, array $fulltextIndexOfNode
 					ctx._source.__fulltext = new LinkedHashMap();
 					foreach (fulltextByNode : ctx._source.__fulltextParts.entrySet()) {
 						foreach (element : fulltextByNode.value.entrySet()) {
-							ctx._source.__fulltext[element.key] += " " + element.value;
+							if (ctx._source.__fulltext.containsKey(element.key)) {
+								ctx._source.__fulltext[element.key] += " " + element.value;
+							} else {
+								ctx._source.__fulltext[element.key] = element.value;
+							}
 						}
 					}
 				',

Configuration/NodeTypes.yaml

@@ -1,47 +1,57 @@
 
 'TYPO3.Neos:Node': &node
+  elasticSearch:
+    fulltext:
+      enable: true
+
   properties:
 
     '__persistenceObjectIdentifier':
       elasticSearch:
         mapping:
           type: string
           index: not_analyzed
+          include_in_all: false
         indexing: ${persistenceObjectIdentifier}
 
     '__identifier':
       elasticSearch:
         mapping:
           type: string
           index: not_analyzed
+          include_in_all: false
         indexing: ${node.getIdentifier()}
 
     '__workspace':
       elasticSearch:
         mapping:
           type: string
           index: not_analyzed
+          include_in_all: false
         indexing: ${node.getWorkspace().getName()}
 
     '__path':
       elasticSearch:
         mapping:
           type: string
           index: not_analyzed
+          include_in_all: false
         indexing: ${node.getPath()}
 
     '__parentPath':
       elasticSearch:
         mapping:
           type: string
           index: not_analyzed
+          include_in_all: false
         # we index *all* parent paths as separate tokens to allow for efficient searching without a prefix query
         indexing: ${ElasticSearch.buildAllPathPrefixes(node.getParentPath())}
 
     '__sortIndex':
       elasticSearch:
         mapping:
           type: integer
+          include_in_all: false
         indexing: ${node.getIndex()}
 
     '_removed':
@@ -55,6 +65,7 @@
         mapping:
           type: string
           index: not_analyzed
+          include_in_all: false
         indexing: ${ElasticSearch.extractNodeTypeNamesAndSupertypes(node.getNodeType())}
 
 'unstructured': *node
@@ -88,7 +99,6 @@
 'TYPO3.Neos:Document':
   elasticSearch:
     fulltext:
-      enable: true
       isRoot: true
   properties:
     '__fulltextParts':

Configuration/Settings.yaml

@@ -24,6 +24,7 @@ Flowpack:
         string:
           mapping:
             type: string
+            include_in_all: false
           indexing: ${value}
 
         boolean: