[2402] search result speedup

ckan · May 18, 2012 · efbf1dc · efbf1dc
1 parent 5cc6143
commit efbf1dc
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 4 deletions.
diff --git a/ckan/lib/search/index.py b/ckan/lib/search/index.py
@@ -98,6 +98,7 @@ def update_dict(self, pkg_dict):
     def index_package(self, pkg_dict):
         if pkg_dict is None:
             return
+        pkg_dict['data_dict'] = json.dumps(pkg_dict)
 
         # add to string field for sorting
         title = pkg_dict.get('title')

diff --git a/ckan/logic/action/get.py b/ckan/logic/action/get.py
@@ -1,5 +1,6 @@
 import uuid
 import logging
+import json
 
 from pylons import config
 from pylons.i18n import _
@@ -805,7 +806,7 @@ def package_search(context, data_dict):
     results = []
     if not abort:
         # return a list of package ids
-        data_dict['fl'] = 'id'
+        data_dict['fl'] = 'id data_dict'
 
 
         # If this query hasn't come from a controller that has set this flag
@@ -822,6 +823,7 @@ def package_search(context, data_dict):
 
         for package in query.results:
             # get the package object
+            package, package_dict = package['id'], package.get('data_dict')
             pkg_query = session.query(model.PackageRevision)\
                 .filter(model.PackageRevision.id == package)\
                 .filter(and_(
@@ -835,9 +837,16 @@ def package_search(context, data_dict):
             if not pkg:
                 log.warning('package %s in index but not in database' % package)
                 continue
-
-            result_dict = model_dictize.package_dictize(pkg,context)
-            results.append(result_dict)
+            ## use data in search index if there
+            if package_dict:
+                ## the package_dict still needs translating when being viewed
+                package_dict = json.loads(package_dict)
+                if context.get('for_view'):
+                    for item in plugins.PluginImplementations( plugins.IPackageController):
+                        package_dict = item.before_view(package_dict)
+                results.append(package_dict)
+            else:
+                results.append(model_dictize.package_dictize(pkg,context))
 
         count = query.count
         facets = query.facets