Răsfoiți Sursa

HUE-1338 [search] Support both plain text and json response from Solr

Romain Rigaux 12 ani în urmă
părinte
comite
33c60c9
1 a modificat fișierele cu 8 adăugiri și 2 ștergeri
  1. 8 2
      apps/search/src/search/api.py

+ 8 - 2
apps/search/src/search/api.py

@@ -58,7 +58,11 @@ class SolrApi(object):
           params += (('fq', fq),)
 
       response = self._root.get('%(collection)s/select' % solr_query, params)
-      return json.loads(response)
+
+      if type(response) != dict:
+        # Got 'plain/text' mimetype instead of 'application/json'
+        response = json.loads(response)
+      return response
     except RestException, e:
       raise PopupException('Error while accessing Solr: %s' % e)
 
@@ -69,7 +73,9 @@ class SolrApi(object):
           ('wt', 'json'),
       )
       response = self._root.get('%(core)s/suggest' % solr_query, params)
-      return json.loads(response)
+      if type(response) != dict:
+        response = json.loads(response)
+      return response
     except RestException, e:
       raise PopupException('Error while accessing Solr: %s' % e)