Don't die on invalid input quite as easily - switch back to default values instead

diff --git a/pgweb/search/views.py b/pgweb/search/views.py
index 54c1a914282e692ca71c4a79fa4d348ad1d4e9a3..cf6c50610ccbd79fa46155fca538bf86c0f8a0ec 100644 (file)
--- a/pgweb/search/views.py
+++ b/pgweb/search/views.py
@@ -52,19 +52,27 @@ def search(request):
 
                if request.REQUEST.has_key('l'):
                        if request.REQUEST['l'] != '':
-                               listid = int(request.REQUEST['l'])
+                               try:
+                                       listid = int(request.REQUEST['l'])
+                               except:
+                                       listid = None
                        else:
                                listid = None
                else:
                        listid = None
 
                if request.REQUEST.has_key('d'):
-                       dateval = int(request.REQUEST['d'])
+                       try:
+                               dateval = int(request.REQUEST['d'])
+                       except:
+                               dateval = None
                else:
                        dateval = None
 
                if request.REQUEST.has_key('s'):
                        listsort = request.REQUEST['s']
+                       if listsort != 'r' and listsort != 'd':
+                               listsort = 'r'
                else:
                        listsort = 'r'