Merge branch '2733-feature-datastore' of github.com:okfn/ckan into 27…

…33-feature-datastore

ckan/config/environment.py

@@ -16,7 +16,6 @@
 import ckan.model as model
 import ckan.plugins as p
 import ckan.lib.helpers as h
-import ckan.lib.search as search
 import ckan.lib.app_globals as app_globals
 
 log = logging.getLogger(__name__)
@@ -161,6 +160,9 @@ def find_controller(self, controller):
 
     # Init SOLR settings and check if the schema is compatible
     #from ckan.lib.search import SolrSettings, check_solr_schema_version
+
+    # lib.search is imported here as we need the config enabled and parsed
+    import ckan.lib.search as search
     search.SolrSettings.init(config.get('solr_url'),
                              config.get('solr_user'),
                              config.get('solr_password'))

ckan/lib/search/__init__.py

@@ -1,5 +1,6 @@
 import logging
 from pylons import config, c
+from paste.deploy.converters import asbool
 
 from ckan import model
 from ckan.plugins import SingletonPlugin, implements, IDomainObjectModification
@@ -27,7 +28,7 @@ def text_traceback():
         ).strip()
     return res
 
-SIMPLE_SEARCH = config.get('ckan.simple_search', False)
+SIMPLE_SEARCH = asbool(config.get('ckan.simple_search', False))
 
 SUPPORTED_SCHEMA_VERSIONS = ['1.4']
 

ckan/lib/search/sql.py

@@ -1,4 +1,4 @@
-from sqlalchemy import or_, and_
+from sqlalchemy import or_
 from ckan.lib.search.query import SearchQuery
 import ckan.model as model
 
@@ -17,7 +17,7 @@ def run(self, query):
         # no support for faceting atm
         self.facets = {}
         limit = min(1000, int(query.get('rows', 10)))
-        
+
         q = query.get('q')
         ourq = model.Session.query(model.Package.id).filter_by(state='active')
 
@@ -34,7 +34,7 @@ def makelike(field):
                 ourq = ourq.filter(subq)
         self.count = ourq.count()
         ourq = ourq.limit(limit)
-        self.results = [r[0] for r in ourq.all()]
+        self.results = [{'id': r[0]} for r in ourq.all()]
 
         return {'results': self.results, 'count': self.count}
 

ckan/tests/lib/test_simple_search.py

@@ -22,7 +22,7 @@ def test_get_all_entity_ids(self):
     def test_run_query_basic(self):
         res = PackageSearchQuery().run({'q':'annakarenina'})
         anna = model.Package.by_name(u'annakarenina')
-        assert_equal(res, {'results': [anna.id], 'count': 1})
+        assert_equal(res, {'results': [{'id': anna.id}], 'count': 1})
 
     def test_run_query_home(self):
         # This is the query from the CKAN home page

doc/datastore.rst

@@ -37,9 +37,6 @@ The DataStore in previous lives required a custom setup of ElasticSearch and Ngi
 but that is no more, as it can use any relational database management system 
 (PostgreSQL for example).
 
-To enable datastore features in CKAN
-------------------------------------
-
 In your config file ensure that the datastore extension is enabled::
 
  ckan.plugins = datastore