浏览代码

[search] Fix stats popup API call

Romain Rigaux 10 年之前
父节点
当前提交
a5e197d
共有 2 个文件被更改,包括 7 次插入4 次删除
  1. 1 1
      apps/beeswax/src/beeswax/server/dbms.py
  2. 6 3
      desktop/libs/libsolr/src/libsolr/api.py

+ 1 - 1
apps/beeswax/src/beeswax/server/dbms.py

@@ -509,7 +509,7 @@ class HiveServer2Dbms(object):
     return self.execute_and_watch(query, query_history=query_history)
 
 
-  def execute_and_watch(self, query, design=None):
+  def execute_and_watch(self, query, design=None, query_history=None):
     """
     Run query and return a QueryHistory object in order to see its progress on a Web page.
     """

+ 6 - 3
desktop/libs/libsolr/src/libsolr/api.py

@@ -73,6 +73,7 @@ class SolrApi(object):
     else:
       return '%(aggregate)s(%(field)s)' % props
 
+    props = {}
   def _get_range_borders(self, collection, query):
     props = {}
     GAPS = {
@@ -164,12 +165,14 @@ class SolrApi(object):
         'start': '%(from)s/%(unit)s' % {'from': timeFilter['from'], 'unit': gap['unit']},
         'end': '%(to)s/%(unit)s' % {'to': timeFilter['to'], 'unit': gap['unit']},
         'gap': '%(coeff)s%(unit)s/%(unit)s' % gap, # add a 'auto'
-      }    
+      }
 
   def _get_fq(self, collection, query):
     params = ()
+    timeFilter = {}
 
-    timeFilter = self._get_range_borders(collection, query)
+    if collection:
+      timeFilter = self._get_range_borders(collection, query)
     if timeFilter and not timeFilter.get('time_filter_overrides'):
       params += (('fq', urllib.unquote(utf_quoter('%(field)s:[%(from)s TO %(to)s]' % timeFilter))),)
 
@@ -588,7 +591,7 @@ class SolrApi(object):
       )
 
       if query is not None:
-        params += self._get_fq(query)
+        params += self._get_fq(None, query)
 
       if facet:
         params += (('stats.facet', facet),)