[Mpuls-commits] r1802 - in wasko/branches/2.0: . waskaweb/lib

[scm-commit@wald.intevation.org]

Author: bh
Date: 2010-02-25 16:15:40 +0100 (Thu, 25 Feb 2010)
New Revision: 1802

Modified:
   wasko/branches/2.0/ChangeLog
   wasko/branches/2.0/waskaweb/lib/search.py
Log:
* waskaweb/lib/search.py (Search.queryDB): Port the exception
handler removal from jmdweb to waskaweb.


Modified: wasko/branches/2.0/ChangeLog
===================================================================
--- wasko/branches/2.0/ChangeLog	2010-02-25 15:13:47 UTC (rev 1801)
+++ wasko/branches/2.0/ChangeLog	2010-02-25 15:15:40 UTC (rev 1802)
@@ -1,5 +1,10 @@
 2010-02-25  Bernhard Herzog  <bh at intevation.de>
 
+	* waskaweb/lib/search.py (Search.queryDB): Port the exception
+	handler removal from jmdweb to waskaweb.
+
+2010-02-25  Bernhard Herzog  <bh at intevation.de>
+
 	* jmdweb/lib/search.py (Search.queryDB): Remove a try-except that
 	simply suppressed all exception without even logging it. Now the
 	exception is not handled in queryDB at all.

Modified: wasko/branches/2.0/waskaweb/lib/search.py
===================================================================
--- wasko/branches/2.0/waskaweb/lib/search.py	2010-02-25 15:13:47 UTC (rev 1801)
+++ wasko/branches/2.0/waskaweb/lib/search.py	2010-02-25 15:15:40 UTC (rev 1802)
@@ -122,13 +122,10 @@
         rows = []
         con, cur = None, None
         try:
-            try:
-                con = db.getConnection()
-                cur = con.cursor(cursor_factory=psycopg2.extras.DictCursor)
-                cur.execute(sql, fields)
-                rows = cur.fetchall()
-            except:
-                return {}
+            con = db.getConnection()
+            cur = con.cursor(cursor_factory=psycopg2.extras.DictCursor)
+            cur.execute(sql, fields)
+            rows = cur.fetchall()
         finally:
             db.recycleConnection(con, cur)
         return rows