status page

[phinde.git] / src / phinde / Elasticsearch.php

diff --git a/src/phinde/Elasticsearch.php b/src/phinde/Elasticsearch.php
index 2887bebe719cd34ec2e892c2fa4b89f640b773d6..069cf1fefd74b495ea3a7aa6b4d11da8bf242a45 100644 (file)
--- a/src/phinde/Elasticsearch.php
+++ b/src/phinde/Elasticsearch.php
@@ -10,10 +10,15 @@ class Elasticsearch
         $this->baseUrl = $baseUrl;
     }
 
         $this->baseUrl = $baseUrl;
     }
 

+    public static function getDocId($url)
+    {
+        return hash('sha256', $url);
+    }
+

     public function isKnown($url)
     {
         $r = new Elasticsearch_Request(
     public function isKnown($url)
     {
         $r = new Elasticsearch_Request(

-            $this->baseUrl . 'document/' . rawurlencode($url),
+            $this->baseUrl . 'document/' . static::getDocId($url),

             \HTTP_Request2::METHOD_HEAD
         );
         $r->allow404 = true;
             \HTTP_Request2::METHOD_HEAD
         );
         $r->allow404 = true;


@@ -24,7 +29,7 @@ class Elasticsearch
     public function get($url)
     {
         $r = new Elasticsearch_Request(
     public function get($url)
     {
         $r = new Elasticsearch_Request(

-            $this->baseUrl . 'document/' . rawurlencode($url),
+            $this->baseUrl . 'document/' . static::getDocId($url),

             \HTTP_Request2::METHOD_GET
         );
         $r->allow404 = true;
             \HTTP_Request2::METHOD_GET
         );
         $r->allow404 = true;


@@ -39,17 +44,30 @@ class Elasticsearch
     public function markQueued($url)
     {
         $r = new Elasticsearch_Request(
     public function markQueued($url)
     {
         $r = new Elasticsearch_Request(

-            $this->baseUrl . 'document/' . rawurlencode($url),
+            $this->baseUrl . 'document/' . static::getDocId($url),

             \HTTP_Request2::METHOD_PUT
         );
             \HTTP_Request2::METHOD_PUT
         );

-        $doc = array(
-            'status' => 'queued',
-            'url' => $url
+        $doc = (object) array(
+            'url' => $url,
+            'status' => (object) array(
+                'processed' => null,
+                'findable'  => false,
+            )

         );
         $r->setBody(json_encode($doc));
         $r->send();
     }
 
         );
         $r->setBody(json_encode($doc));
         $r->send();
     }
 

+    public function countDocuments()
+    {
+        $r = new Elasticsearch_Request(
+            $this->baseUrl . 'document/_count',
+            \HTTP_Request2::METHOD_GET
+        );
+        $res = $r->send();
+        return json_decode($res->getBody())->count;
+    }
+

     public function search($query, $filters, $site, $page, $perPage, $sort)
     {
         if (preg_match_all('#nick:([^ ]*)#', $query, $matches)) {
     public function search($query, $filters, $site, $page, $perPage, $sort)
     {
         if (preg_match_all('#nick:([^ ]*)#', $query, $matches)) {


@@ -109,12 +127,12 @@ class Elasticsearch
         );
         $qMust[] = array(
             'term' => array(
         );
         $qMust[] = array(
             'term' => array(

-                'status' => 'indexed'
+                'status.findable' => true

             )
         );
 
         if ($sort == 'date') {
             )
         );
 
         if ($sort == 'date') {

-            $sortCfg = array('modate' => array('order' => 'desc'));
+            $sortCfg = array('status.modate' => array('order' => 'desc'));

         } else {
             $sortCfg = array();
         }
         } else {
             $sortCfg = array();
         }


@@ -133,7 +151,7 @@ class Elasticsearch
                 'url',
                 'title',
                 'author',
                 'url',
                 'title',
                 'author',

-                'modate',
+                'status.modate',

             ),
             'query' => array(
                 'bool' => array(
             ),
             'query' => array(
                 'bool' => array(