Package search rows limit is now configurable

ckan/lib/search/query.py

@@ -312,7 +312,9 @@ def run(self, query, permission_labels=None, **kwargs):
             query['q'] = "*:*"
 
         # number of results
-        rows_to_return = min(1000, int(query.get('rows', 10)))
+        rows_to_return = min(
+            int(config.get('ckan.search.rows_max', 1000)),
+            int(query.get('rows', 10)))
         if rows_to_return > 0:
             # #1683 Work around problem of last result being out of order
             #       in SOLR 1.4

ckan/logic/action/get.py

@@ -1694,8 +1694,8 @@ def package_search(context, data_dict):
         documentation, this is a comma-separated string of field names and
         sort-orderings.
     :type sort: string
-    :param rows: the number of matching rows to return. There is a hard limit
-        of 1000 datasets per query.
+    :param rows: the number of matching rows (datasets) to return. Default is
+        10. Upper limit is 1000, depending on site configuration.
     :type rows: int
     :param start: the offset in the complete result for where the set of
         returned datasets should begin.

ckan/tests/logic/action/test_get.py

@@ -892,6 +892,25 @@ def test_bad_solr_parameter(self):
         # SOLR error is 'Missing sort order' or 'Missing_sort_order',
         # depending on the solr version.
 
+    def _create_bulk_datasets(self, name, count):
+        from ckan import model
+        model.repo.new_revision()
+        pkgs = [model.Package(name='{}_{}'.format(name, i))
+                for i in range(count)]
+        model.Session.add_all(pkgs)
+        model.repo.commit_and_remove()
+
+    def test_rows_returned_default(self):
+        self._create_bulk_datasets('rows_default', 11)
+        results = logic.get_action('package_search')({}, {})
+        eq(len(results['results']), 10)  # i.e. 'rows' default value
+
+    @helpers.change_config('ckan.search.rows_max', '12')
+    def test_rows_returned_limited(self):
+        self._create_bulk_datasets('rows_limited', 14)
+        results = logic.get_action('package_search')({}, {'rows': '15'})
+        eq(len(results['results']), 12)  # i.e. ckan.search.rows_max
+
     def test_facets(self):
         org = factories.Organization(name='test-org-facet', title='Test Org')
         factories.Dataset(owner_org=org['id'])

doc/maintaining/configuration.rst

@@ -734,6 +734,18 @@ Default value: ``None``
 
 List of the extra resource fields that would be used when searching.
 
+.. _ckan.search.rows_max:
+
+ckan.search.rows_max
+^^^^^^^^^^^^^^^^^^^^
+
+Example::
+
+  ckan.search.rows_max = 1000
+
+Default value:  ``1000``
+
+Maximum allowed value for ``package_search``'s ``rows`` parameter.
 
 Redis Settings
 ---------------