[FEATURE] indexing dimensions 'not_analyzed'

Author: mgoldbeck

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

@@ -176,13 +176,6 @@ public function indexNode(Node $node, $targetWorkspaceName = NULL) {
 			$documentData['__dimensionCombinations'] = $dimensionCombinations;
 		}
 
-		//@todo remove the hardcoded language part. There will be a merge of the Neos and TYPO3CR Settings
-		if (is_array($dimensionCombinations)) {
-			$documentData['__dimensions'] = array(
-				"language" => $dimensionCombinations["language"][0]
-			);
-		}
-
 		if ($this->isFulltextEnabled($node)) {
 			if ($this->isFulltextRoot($node)) {
 				// for fulltext root documents, we need to preserve the "__fulltext" field. That's why we use the

Classes/Flowpack/ElasticSearch/ContentRepositoryAdaptor/Mapping/NodeTypeMappingBuilder.php

@@ -92,6 +92,17 @@ public function buildMappingInformation(Index $index) {
 			$type = $index->findType(self::convertNodeTypeNameToMappingName($nodeTypeName));
 			$mapping = new Mapping($type);
 
+			// http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/mapping-root-object-type.html#_dynamic_templates
+			// 'not_analyzed' is necessary
+			$mapping->addDynamicTemplate('dimensions', array(
+				'path_match' => '__dimensionCombinations.*',
+				'match_mapping_type' => 'string',
+				'mapping' => array(
+					'type' => 'string',
+					'index' => 'not_analyzed'
+				)
+			));
+
 			foreach ($nodeType->getProperties() as $propertyName => $propertyConfiguration) {
 				if (isset($propertyConfiguration['search']) && isset($propertyConfiguration['search']['elasticSearchMapping'])) {