From d7651fd96dcfa2829519504e4c8ec1ce511cd57f Mon Sep 17 00:00:00 2001
From: Christian Weiske <cweiske@cweiske.de>
Date: Mon, 7 Nov 2016 21:41:36 +0100
Subject: Big patch merging crawling+indexing into one command, new json
 document structure

---
 data/elasticsearch-mapping.json    | 29 +++++++++++++++++++++--------
 data/templates/opensearch.htm      |  4 ++--
 data/templates/search/hit-chat.htm |  4 ++--
 data/templates/search/hit.htm      |  2 +-
 4 files changed, 26 insertions(+), 13 deletions(-)

(limited to 'data')

diff --git a/data/elasticsearch-mapping.json b/data/elasticsearch-mapping.json
index 617c69f..aad27d2 100644
--- a/data/elasticsearch-mapping.json
+++ b/data/elasticsearch-mapping.json
@@ -3,8 +3,27 @@
         "document": {
             "properties": {
                 "status": {
-                    "type": "string",
-                    "index": "not_analyzed"
+                    "type": "object",
+                    "properties": {
+                        "code": {
+                            "type": "integer"
+                        },
+                        "location": {
+                            "type": "string"
+                        },
+                        "processed": {
+                            "type": "date"
+                        },
+                        "crdate": {
+                            "type": "date"
+                        },
+                        "modate": {
+                            "type": "date"
+                        },
+                        "findable": {
+                            "type": "boolean"
+                        }
+                    }
                 },
                 "type": {
                     "type": "string",
@@ -76,12 +95,6 @@
                 "tags": {
                     "type": "string",
                     "boost": 1.5
-                },
-                "crdate": {
-                    "type": "date"
-                },
-                "modate": {
-                    "type": "date"
                 }
             }
         }
diff --git a/data/templates/opensearch.htm b/data/templates/opensearch.htm
index 1ba805a..6565516 100644
--- a/data/templates/opensearch.htm
+++ b/data/templates/opensearch.htm
@@ -27,8 +27,8 @@
      <title>{{doc.title}}</title>
      <link href="{{doc.url}}"/>
      <id>{{doc.url}}</id>
-     {% if doc.modate %}
-     <updated>{{doc.modate|date('c')}}</updated>
+     {% if doc.status.modate %}
+     <updated>{{doc.status.modate|date('c')}}</updated>
      {% endif %}
      <content type="text">{{doc.htmlText|striptags}}</content>
     </entry>
diff --git a/data/templates/search/hit-chat.htm b/data/templates/search/hit-chat.htm
index 6739670..501b843 100644
--- a/data/templates/search/hit-chat.htm
+++ b/data/templates/search/hit-chat.htm
@@ -15,8 +15,8 @@
   </em>
   at
   {% endif %}
-  {% if doc.modate %}
-  <a href="{{doc.url}}" class="date">{{doc.modate|date("Y-m-d H:i")}}</a>
+  {% if doc.status.modate %}
+  <a href="{{doc.url}}" class="date">{{doc.status.modate|date("Y-m-d H:i")}}</a>
   {% endif %}
  </span>
 </li>
diff --git a/data/templates/search/hit.htm b/data/templates/search/hit.htm
index dababcb..f61a271 100644
--- a/data/templates/search/hit.htm
+++ b/data/templates/search/hit.htm
@@ -16,7 +16,7 @@
  <br/><tt class="url" title="{{doc.extra.cleanUrl}}">{{ellipsis(doc.extra.cleanUrl, 60)}}</tt>
  <span class="extract">
   <br/>
-  {% if doc.modate %}
+  {% if doc.status.modate %}
   <span class="date">{{doc.extra.day|date("Y-m-d")}}</span>
   {% endif %}
   {{doc.htmlText|raw}}
-- 
cgit v1.2.3