Merge pull request #14 from Flowpack/yaml

[TASK] Adapt to YAML parser change in Flow

Author: kdambekalns

Configuration/NodeTypes.yaml

@@ -12,31 +12,31 @@
           type: string
           index: not_analyzed
           include_in_all: false
-        indexing: ${persistenceObjectIdentifier}
+        indexing: '${persistenceObjectIdentifier}'
 
     '__identifier':
       elasticSearch:
         mapping:
           type: string
           index: not_analyzed
           include_in_all: false
-        indexing: ${node.getIdentifier()}
+        indexing: '${node.getIdentifier()}'
 
     '__workspace':
       elasticSearch:
         mapping:
           type: string
           index: not_analyzed
           include_in_all: false
-        indexing: ${node.getWorkspace().getName()}
+        indexing: '${node.getWorkspace().getName()}'
 
     '__path':
       elasticSearch:
         mapping:
           type: string
           index: not_analyzed
           include_in_all: false
-        indexing: ${node.getPath()}
+        indexing: '${node.getPath()}'
 
     '__parentPath':
       elasticSearch:
@@ -45,14 +45,14 @@
           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())}
+        indexing: '${ElasticSearch.buildAllPathPrefixes(node.getParentPath())}'
 
     '__sortIndex':
       elasticSearch:
         mapping:
           type: integer
           include_in_all: false
-        indexing: ${node.getIndex()}
+        indexing: '${node.getIndex()}'
 
     '_removed':
       elasticSearch:
@@ -66,15 +66,15 @@
           type: string
           index: not_analyzed
           include_in_all: false
-        indexing: ${ElasticSearch.extractNodeTypeNamesAndSupertypes(node.getNodeType())}
+        indexing: '${ElasticSearch.extractNodeTypeNamesAndSupertypes(node.getNodeType())}'
 
 'unstructured': *node
 
 'TYPO3.Neos:Hidable':
   properties:
     '_hidden':
       elasticSearch:
-        indexing: ${node.isHidden()}
+        indexing: '${node.isHidden()}'
 
 'TYPO3.Neos:Timable':
   properties:
@@ -84,7 +84,7 @@
           type: date
           include_in_all: false
           format: 'date_time_no_millis'
-        indexing: ${(node.hiddenBeforeDateTime ? node.hiddenBeforeDateTime.format('Y-m-d\TH:i:s') + 'Z' : null)}
+        indexing: '${(node.hiddenBeforeDateTime ? node.hiddenBeforeDateTime.format("Y-m-d\TH:i:s") + "Z" : null)}'
 
 
     '_hiddenAfterDateTime':
@@ -93,7 +93,7 @@
           type: date
           include_in_all: false
           format: 'date_time_no_millis'
-        indexing: ${(node.hiddenAfterDateTime ? node.hiddenAfterDateTime.format('Y-m-d\TH:i:s') + 'Z' : null)}
+        indexing: '${(node.hiddenAfterDateTime ? node.hiddenAfterDateTime.format("Y-m-d\TH:i:s") + "Z" : null)}'
 
 
 'TYPO3.Neos:Document':
@@ -148,10 +148,10 @@
   properties:
     'text':
       elasticSearch:
-        fulltextExtractor: ${ElasticSearch.fulltext.extractHtmlTags(value)}
+        fulltextExtractor: '${ElasticSearch.fulltext.extractHtmlTags(value)}'
 
 'TYPO3.Neos.NodeTypes:Headline':
   properties:
     'title':
       elasticSearch:
-        fulltextExtractor: ${ElasticSearch.fulltext.extractHtmlTags(value)}
+        fulltextExtractor: '${ElasticSearch.fulltext.extractHtmlTags(value)}'

Configuration/Settings.yaml

@@ -9,9 +9,9 @@ Flowpack:
       log:
         backendOptions:
           fileBackend:
-            logFileURL: %FLOW_PATH_DATA%Logs/ElasticSearch.log
+            logFileURL: '%FLOW_PATH_DATA%Logs/ElasticSearch.log'
             createParentDirectories: TRUE
-            severityThreshold: %LOG_DEBUG%
+            severityThreshold: '%LOG_DEBUG%'
             maximumLogFileSize: 10485760
             logFilesToKeep: 1
             logMessageOrigin: FALSE
@@ -25,24 +25,24 @@ Flowpack:
           mapping:
             type: string
             include_in_all: false
-          indexing: ${value}
+          indexing: '${value}'
 
         boolean:
           mapping:
             type: boolean
-          indexing: ${value}
+          indexing: '${value}'
 
         integer:
           mapping:
             type: integer
-          indexing: ${value}
+          indexing: '${value}'
 
         date:
           mapping:
             type: date
             format: 'date_time_no_millis'
             include_in_all: false
-          indexing: ${(value ? value.format('Y-m-d\TH:i:s') + 'Z' : null)}
+          indexing: '${(value ? value.format("Y-m-d\TH:i:s") + "Z" : null)}'
 
 
         'TYPO3\Media\Domain\Model\Video':
@@ -57,13 +57,13 @@ Flowpack:
           mapping:
             type: string # an array of strings, to be precise
             index: not_analyzed
-          indexing: ${ElasticSearch.convertArrayOfNodesToArrayOfNodeIdentifiers(value)}
+          indexing: '${ElasticSearch.convertArrayOfNodesToArrayOfNodeIdentifiers(value)}'
 
         'reference':
           mapping:
             type: string
             index: not_analyzed
-          indexing: ${value.identifier}
+          indexing: '${value.identifier}'
 
 
       # Default context objects that are available in Eel expressions