Merge pull request #1118 from okfn/1118-error-not-caught

Invalid request causes 500 through ValueError in search facet
ckan · Aug 1, 2013 · 408a5d6 · 408a5d6
2 parents f5464e7 + bf58021
commit 408a5d6
Showing 1 changed file with 8 additions and 2 deletions.
diff --git a/ckan/controllers/package.py b/ckan/controllers/package.py
@@ -264,8 +264,14 @@ def pager_url(q=None, page=None):
             c.page = h.Page(collection=[])
         c.search_facets_limits = {}
         for facet in c.search_facets.keys():
-            limit = int(request.params.get('_%s_limit' % facet,
-                                           g.facets_default_number))
+            try:
+                limit = int(request.params.get('_%s_limit' % facet,
+                                               g.facets_default_number))
+            except ValueError:
+                abort(400, _('Parameter "{parameter_name}" is not '
+                             'an integer').format(
+                                 parameter_name='_%s_limit' % facet
+                             ))
             c.search_facets_limits[facet] = limit
 
         maintain.deprecate_context_item(