Support elasticsearch 2.0.

[phorkie.git] / src / phorkie / Database / Adapter / Elasticsearch / Setup.php

diff --git a/src/phorkie/Database/Adapter/Elasticsearch/Setup.php b/src/phorkie/Database/Adapter/Elasticsearch/Setup.php
index bb76d548006976143a1af5ed7ce166ab5bd1c77d..1e632ba1e290bcb0494db966cdc5ede0431c1344 100644 (file)
--- a/src/phorkie/Database/Adapter/Elasticsearch/Setup.php
+++ b/src/phorkie/Database/Adapter/Elasticsearch/Setup.php
@@ -33,6 +33,38 @@ class Database_Adapter_Elasticsearch_Setup implements Database_ISetup
         );
         $r->send();
 
+        //mapping for files
+        $r = new Database_Adapter_Elasticsearch_HTTPRequest(
+            $this->searchInstance . 'file/_mapping',
+            \HTTP_Request2::METHOD_PUT
+        );
+        $r->setBody(
+            json_encode(
+                (object)array(
+                    'file' => (object)array(
+                        '_parent' => (object)array(
+                            'type' => 'repo'
+                        ),
+                        'properties' => (object)array(
+                            'name' => (object)array(
+                                'type'  => 'string',
+                                'boost' => 1.5
+                            ),
+                            'extension' => (object)array(
+                                'type'  => 'string',
+                                'boost' => 1.0
+                            ),
+                            'content' => (object)array(
+                                'type'  => 'string',
+                                'boost' => 0.8
+                            )
+                        )
+                    )
+                )
+            )
+        );
+        $r->send();
+
         //create mapping
         //mapping for repositories
         $r = new Database_Adapter_Elasticsearch_HTTPRequest(
@@ -45,7 +77,7 @@ class Database_Adapter_Elasticsearch_Setup implements Database_ISetup
                     'repo' => (object)array(
                         '_timestamp' => (object)array(
                             'enabled' => true,
-                            'path'    => 'tstamp',
+                            //'path'    => 'tstamp',
                         ),
                         'properties' => (object)array(
                             'id' => (object)array(
@@ -73,38 +105,6 @@ class Database_Adapter_Elasticsearch_Setup implements Database_ISetup
             )
         );
         $r->send();
-
-        //mapping for files
-        $r = new Database_Adapter_Elasticsearch_HTTPRequest(
-            $this->searchInstance . 'file/_mapping',
-            \HTTP_Request2::METHOD_PUT
-        );
-        $r->setBody(
-            json_encode(
-                (object)array(
-                    'file' => (object)array(
-                        '_parent' => (object)array(
-                            'type' => 'repo'
-                        ),
-                        'properties' => (object)array(
-                            'name' => (object)array(
-                                'type'  => 'string',
-                                'boost' => 1.5
-                            ),
-                            'extension' => (object)array(
-                                'type'  => 'string',
-                                'boost' => 1.0
-                            ),
-                            'content' => (object)array(
-                                'type'  => 'string',
-                                'boost' => 0.8
-                            )
-                        )
-                    )
-                )
-            )
-        );
-        $r->send();
     }
 
 }