move elasticsearch code in one folder

diff --git a/scripts/index.php b/scripts/index.php
index eb328b50cc243df40a4210925865a8af7e457baa..5afbee090d70fad2d35af5a1016444bf6332aa16 100644 (file)
--- a/scripts/index.php
+++ b/scripts/index.php
@@ -39,7 +39,6 @@ $db->getSetup()->setup();
 
 $rs = new Repositories();
 list($repos, $count) = $rs->getList(0, 10000);
-$idx = new Indexer_Elasticsearch();
 foreach ($repos as $repo) {
     echo 'Indexing ' . $repo->id . "\n";
     $idx->addRepo($repo, filectime($repo->gitDir));

diff --git a/src/phorkie/Database.php b/src/phorkie/Database.php
index e9a75a1fc2dd0b98d2829e0be8bd07274351ee4a..9854e7c7a6085bddf9d019d7d49547493efdccda 100644 (file)
--- a/src/phorkie/Database.php
+++ b/src/phorkie/Database.php
@@ -5,17 +5,17 @@ class Database
 {
     public function getSearch()
     {
-        return new Search_Elasticsearch();
+        return new Database_Adapter_Elasticsearch_Search();
     }
 
     public function getIndexer()
     {
-        return new Indexer_Elasticsearch();
+        return new Database_Adapter_Elasticsearch_Indexer();
     }
 
     public function getSetup()
     {
-        return new Database_Setup_Elasticsearch();
+        return new Database_Adapter_Elasticsearch_Setup();
     }
 }
 

diff --git a/src/phorkie/Indexer/Elasticsearch.php b/src/phorkie/Database/Adapter/Elasticsearch/Indexer.php
similarity index 98%
rename from src/phorkie/Indexer/Elasticsearch.php
rename to src/phorkie/Database/Adapter/Elasticsearch/Indexer.php
index 077865ef5d0d98b273d30b70ab3cafe901aaba00..d9d1032bbeb4bc46989cd88712b4d0d466abcc78 100644 (file)
--- a/src/phorkie/Indexer/Elasticsearch.php
+++ b/src/phorkie/Database/Adapter/Elasticsearch/Indexer.php
@@ -1,7 +1,7 @@
 <?php
 namespace phorkie;
 
-class Indexer_Elasticsearch
+class Database_Adapter_Elasticsearch_Indexer
 {
     public function __construct()
     {

diff --git a/src/phorkie/Search/Elasticsearch.php b/src/phorkie/Database/Adapter/Elasticsearch/Search.php
similarity index 98%
rename from src/phorkie/Search/Elasticsearch.php
rename to src/phorkie/Database/Adapter/Elasticsearch/Search.php
index 06a0cfe57552cac5e72ab5e9848f732ff08faf8b..88ad4ac8f0fb0dd6d73d38fa18ede6018d4f7f6e 100644 (file)
--- a/src/phorkie/Search/Elasticsearch.php
+++ b/src/phorkie/Database/Adapter/Elasticsearch/Search.php
@@ -1,7 +1,7 @@
 <?php
 namespace phorkie;
 
-class Search_Elasticsearch
+class Database_Adapter_Elasticsearch_Search
 {
     public function __construct()
     {

diff --git a/src/phorkie/Database/Setup/Elasticsearch.php b/src/phorkie/Database/Adapter/Elasticsearch/Setup.php
similarity index 98%
rename from src/phorkie/Database/Setup/Elasticsearch.php
rename to src/phorkie/Database/Adapter/Elasticsearch/Setup.php
index b5e2005c4583bb23e7435cbbe49d36fe9995c46a..acbe77c977f5de38c7b64977dc5831ab53cbf91b 100644 (file)
--- a/src/phorkie/Database/Setup/Elasticsearch.php
+++ b/src/phorkie/Database/Adapter/Elasticsearch/Setup.php
@@ -1,7 +1,7 @@
 <?php
 namespace phorkie;
 
-class Database_Setup_Elasticsearch
+class Database_Adapter_Elasticsearch_Setup
 {
     public function __construct()
     {