From f2bd717b4d64bd3d9f183b92a22665282fc8b82e Mon Sep 17 00:00:00 2001
From: neodarz <neodarz@neodarz.net>
Date: Wed, 16 Jan 2019 22:00:27 +0100
Subject: Add searchd error management

---
 sphinx/sphinx.py | 51 +++++++++++++++++++++++++++------------------------
 1 file changed, 27 insertions(+), 24 deletions(-)

(limited to 'sphinx/sphinx.py')

diff --git a/sphinx/sphinx.py b/sphinx/sphinx.py
index 1fffa3e..88f4733 100644
--- a/sphinx/sphinx.py
+++ b/sphinx/sphinx.py
@@ -11,29 +11,32 @@ def search(request):
     Simple sphinx seach function, return a array of all documents matching the
     search terms.
     """
-    res = sphinxclient.Query(request)
-
-    opts = {'before_match': '<b>', 'after_match':'</b>', 'chunk_separator': '...', 'limit': 400, 'around': 15}
-    index = 'datas'
-
-    response = []
-
-    if 'matches' in res:
-        n = 1
-        for match in res['matches']:
-            attrsdump = ''
-            for attr in res['attrs']:
-                attrname = attr[0]
-                attrtype = attr[1]
-                if attrname != "content":
-                    value = match['attrs'][attrname]
-                    if attrtype==SPH_ATTR_TIMESTAMP:
-                        value = time.strftime ( '%Y-%m-%d %H:%M:%S', time.localtime(value) )
-                    attrsdump = '%s, \'%s\'=\'%s\'' % ( attrsdump, attrname, value)
-            docs = []
-            docs.append(''.join([line.strip('\n') for line in match['attrs']['content']]))
-            res_excerpts = sphinxclient.BuildExcerpts(index=index, docs=docs, opts=opts, words=request)
-            response.append({'id': match['id'], 'weight': match['weight'], 'url': match['attrs']['url'], 'title': match['attrs']['title'], 'excerpts': res_excerpts})
-            n += 1
+    status = sphinxclient.Status()
+    response = {'error': 1, 'msg': 'Sphinx server not available'}
+    if status != None:
+        res = sphinxclient.Query(request)
+
+        opts = {'before_match': '<b>', 'after_match':'</b>', 'chunk_separator': '...', 'limit': 400, 'around': 15}
+        index = 'datas'
+
+        response = []
+
+        if 'matches' in res:
+            n = 1
+            for match in res['matches']:
+                attrsdump = ''
+                for attr in res['attrs']:
+                    attrname = attr[0]
+                    attrtype = attr[1]
+                    if attrname != "content":
+                        value = match['attrs'][attrname]
+                        if attrtype==SPH_ATTR_TIMESTAMP:
+                            value = time.strftime ( '%Y-%m-%d %H:%M:%S', time.localtime(value) )
+                        attrsdump = '%s, \'%s\'=\'%s\'' % ( attrsdump, attrname, value)
+                docs = []
+                docs.append(''.join([line.strip('\n') for line in match['attrs']['content']]))
+                res_excerpts = sphinxclient.BuildExcerpts(index=index, docs=docs, opts=opts, words=request)
+                response.append({'id': match['id'], 'weight': match['weight'], 'url': match['attrs']['url'], 'title': match['attrs']['title'], 'excerpts': res_excerpts})
+                n += 1
 
     return response
-- 
cgit v1.2.1