From bafffa0ab9fcd4d7781d28150bfc3312ba88c45a Mon Sep 17 00:00:00 2001
From: Magnus Hagander <magnus@hagander.net>
Date: Sun, 4 Dec 2011 16:54:49 +0100
Subject: [PATCH] Don't die on invalid input quite as easily - switch back to
 default values instead

---
 pgweb/search/views.py | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/pgweb/search/views.py b/pgweb/search/views.py
index 54c1a914..cf6c5061 100644
--- 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'
 
-- 
2.39.5