Merge pull request #85 from nurikabe/2.0

Allow "_source" configuration.
FriendsOfSymfony · Apr 17, 2012 · 96776e3 · 96776e3
2 parents c3391d9 + 87f1141
commit 96776e3
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 1 deletion.
diff --git a/DependencyInjection/Configuration.php b/DependencyInjection/Configuration.php
@@ -207,6 +207,7 @@ protected function getTypesNode()
                     ->end()
                 ->end()
                 ->append($this->getMappingsNode())
+                ->append($this->getSourceNode())
             ->end()
         ;
 
@@ -256,4 +257,28 @@ protected function getMappingsNode()
 
         return $node;
     }
+
+    /**
+     * Returns the array node used for "_source".
+     */
+    protected function getSourceNode()
+    {
+        $builder = new TreeBuilder();
+        $node = $builder->root('_source');
+
+        $node
+            ->children()
+                ->arrayNode('excludes')
+                    ->useAttributeAsKey('name')
+                    ->prototype('scalar')->end()
+                ->end()
+                ->arrayNode('includes')
+                    ->useAttributeAsKey('name')
+                    ->prototype('scalar')->end()
+                ->end()
+            ->end()
+        ;
+
+        return $node;
+    }
 }
diff --git a/DependencyInjection/FOQElasticaExtension.php b/DependencyInjection/FOQElasticaExtension.php
@@ -167,8 +167,11 @@ protected function loadTypes(array $types, ContainerBuilder $container, $indexNa
             $typeDef->setFactoryService($indexId);
             $typeDef->setFactoryMethod('getType');
             $container->setDefinition($typeId, $typeDef);
+            if (isset($type['_source'])) {
+                $this->indexConfigs[$indexName]['config']['mappings'][$name]['_source'] = $type['_source'];
+            }
             if (isset($type['mappings'])) {
-                $this->indexConfigs[$indexName]['config']['mappings'][$name] = array('properties' => $type['mappings']);
+                $this->indexConfigs[$indexName]['config']['mappings'][$name]['properties'] = $type['mappings'];
                 $typeName = sprintf('%s/%s', $indexName, $name);
                 $this->typeFields[$typeName] = array_keys($type['mappings']);
             }