Эх сурвалжийг харах

[search] Updating the tests

Romain Rigaux 11 жил өмнө
parent
commit
90fd4bd

+ 1 - 24
apps/search/src/search/api.py

@@ -185,31 +185,8 @@ class SolrApi(BaseSolrApi):
       return (('doAs', self._user ),)
     return (('user.name', DEFAULT_USER), ('doAs', self._user),)
 
-  @demo_handler
-  def query(self, solr_query, hue_core):
-    try:
-      params = self._get_params() + (
-          ('q', solr_query['q'] or EMPTY_QUERY.get()),
-          ('wt', 'json'),
-          ('rows', solr_query['rows']),
-          ('start', solr_query['start']),
-      )
-
-      params += hue_core.get_query(solr_query)
-
-      fqs = solr_query['fq'].split('|')
-      for fq in fqs:
-        if fq:
-          params += (('fq', urllib.unquote(utf_quoter(fq))),)
-
-      response = self._root.get('%(collection)s/select' % solr_query, params)
-
-      return self._get_json(response)
-    except RestException, e:
-      raise PopupException(e, title=_('Error while accessing Solr'))
-
   #@demo_handler
-  def query2(self, collection, query):
+  def query(self, collection, query):
     solr_query = {}      
     
     solr_query['collection'] = collection['name']

+ 7 - 6
apps/search/src/search/templates/search.mako

@@ -630,14 +630,15 @@ ${ commonheader(_('Search'), "search", user, "80px") | n,unicode }
   <span data-bind="text: ($data.response.start + $root.collection.template.rows())"></span>
   ${ _('of') }
   <span data-bind="text: $data.response.numFound"></span>
-  ${ _(' results.') }
+  ${ _(' results') }
 
-  ${ _('Show') }
-  <span data-bind="visible: $root.isEditing()" class="spinedit-pagination">
-    <input type="text" data-bind="spinedit: $root.collection.template.rows, valueUpdate:'afterkeydown'" style="text-align: center; margin-bottom: 0" />
+  <span data-bind="visible: $root.isEditing()">
+    ${ _('Show') }
+    <span class="spinedit-pagination">
+      <input type="text" data-bind="spinedit: $root.collection.template.rows, valueUpdate:'afterkeydown'" style="text-align: center; margin-bottom: 0" />
+    </span>
+    ${ _('results per page') }
   </span>
-  ${ _('results per page.') }
-
 
   <a href="javascript: void(0)" title="${ _('Next') }">
     <span data-bind="text: name, click: $root.collection.toggleSortColumnGridLayout"></span>

Файлын зөрүү хэтэрхий том тул дарагдсан байна
+ 40 - 10
apps/search/src/search/tests.py


+ 2 - 2
apps/search/src/search/views.py

@@ -129,7 +129,7 @@ def search(request):
     
   if collection:
     try:      
-      response = SolrApi(SOLR_URL.get(), request.user).query2(collection, query)
+      response = SolrApi(SOLR_URL.get(), request.user).query(collection, query)
       response = augment_solr_response(response, collection, query)
     except RestException, e:
       try:
@@ -175,7 +175,7 @@ def save(request):
   return HttpResponse(json.dumps(response), mimetype="application/json")
 
 
-def download(request):  
+def download(request):
   try:
     file_format = 'csv' if 'csv' in request.POST else 'xls' if 'xls' in request.POST else 'json'
     response = search(request)

+ 1 - 1
apps/search/static/js/search.ko.js

@@ -851,7 +851,7 @@ var SearchViewModel = function (collection_json, query_json, initial_json) {
   self.init = function (callback) {
 	self.initial.init();
 	self.collection.syncFields();
-    self.isEditing(true);
+    //self.isEditing(true);
     self.search(callback);
   }
   

Энэ ялгаанд хэт олон файл өөрчлөгдсөн тул зарим файлыг харуулаагүй болно