javascript embedding support

[phorkie.git] / scripts / search.php

diff --git a/scripts/search.php b/scripts/search.php
index af7a08573d779f94f4cd1d08413150e2145970c0..121c7e21b51fd5b9d92c379953a9a674ca55e96e 100644 (file)
--- a/scripts/search.php
+++ b/scripts/search.php
@@ -2,20 +2,7 @@
 //search
 
 namespace phorkie;
 //search
 
 namespace phorkie;

-set_include_path(
-    __DIR__ . '/../src/'
-    . PATH_SEPARATOR . get_include_path()
-);
-spl_autoload_register(
-    function ($class) {
-        $file = str_replace(array('\\', '_'), '/', $class) . '.php';
-        $hdl = @fopen($file, 'r', true);
-        if ($hdl !== false) {
-            fclose($hdl);
-            require $file;
-        }
-    }
-);
+require_once __DIR__ . '/../src/phorkie/autoload.php';

 require_once __DIR__ . '/../data/config.default.php';
 if (file_exists(__DIR__ . '/../data/config.php')) {
     require_once __DIR__ . '/../data/config.php';
 require_once __DIR__ . '/../data/config.default.php';
 if (file_exists(__DIR__ . '/../data/config.php')) {
     require_once __DIR__ . '/../data/config.php';


@@ -24,8 +11,8 @@ if ($GLOBALS['phorkie']['cfg']['setupcheck']) {
     SetupCheck::run();
 }
 
     SetupCheck::run();
 }
 

-$r = new \HTTP_Request2(
-    'http://localhost:9200/phorkie/repo/_search',
+$r = new Database_Adapter_Elasticsearch_HTTPRequest(
+    $GLOBALS['phorkie']['cfg']['elasticsearch'] . 'repo/_search',

     \HTTP_Request2::METHOD_GET
 );
 $r->setBody(
     \HTTP_Request2::METHOD_GET
 );
 $r->setBody(