[Mpuls-commits] r4913 - in base/trunk: . mpulsweb/controllers

[scm-commit@wald.intevation.org]

Author: bh
Date: 2011-04-15 13:10:32 +0200 (Fri, 15 Apr 2011)
New Revision: 4913

Modified:
   base/trunk/ChangeLog
   base/trunk/mpulsweb/controllers/evaluate.py
Log:
* mpulsweb/controllers/evaluate.py: Fix formatting.


Modified: base/trunk/ChangeLog
===================================================================
--- base/trunk/ChangeLog	2011-04-15 10:39:12 UTC (rev 4912)
+++ base/trunk/ChangeLog	2011-04-15 11:10:32 UTC (rev 4913)
@@ -1,5 +1,9 @@
 2011-04-15  Bernhard Herzog  <bh at intevation.de>
 
+	* mpulsweb/controllers/evaluate.py: Fix formatting.
+
+2011-04-15  Bernhard Herzog  <bh at intevation.de>
+
 	* mpulsweb/lib/validators.py
 	(EvaluationFormValidator.selected_ids): Add from_python
 	converter. We already have the to_python converter here and by

Modified: base/trunk/mpulsweb/controllers/evaluate.py
===================================================================
--- base/trunk/mpulsweb/controllers/evaluate.py	2011-04-15 10:39:12 UTC (rev 4912)
+++ base/trunk/mpulsweb/controllers/evaluate.py	2011-04-15 11:10:32 UTC (rev 4913)
@@ -91,7 +91,7 @@
         c.evalconfig = EvaluationConfig(get_configfile(id), None, None, None,
                                         None, None, None, None, None)
         evaloptions = get_search_options(session.get('evaluation.options'), id,
-                                         session.get("evaluation_ids",()), 
+                                         session.get("evaluation_ids", ()),
                                          session.get("id_field"),
                                          session.get("sql_where"))
 
@@ -157,7 +157,8 @@
         id_field = form_result.get("id_field")
         if form_result.get("selected_ids"):
             selected_ids = ("(%s in (%s))"
-                            % (id_field, ",".join(map(str, form_result["selected_ids"]))))
+                            % (id_field,
+                               ",".join(map(str, form_result["selected_ids"]))))
 
         if form_result.get("sql_where"):
             where_clauses.append(form_result.get("sql_where"))
@@ -166,7 +167,8 @@
 
         where_clauses.append(self.type_ending_clause(params))
 
-        params['sql'] = ("SELECT %%(fields)s from master_tbl_eval_total_view m JOIN ka_status_tbl_view st on st.master_id = m.id"
+        params['sql'] = ("SELECT %%(fields)s from master_tbl_eval_total_view m"
+                         " JOIN ka_status_tbl_view st on st.master_id = m.id"
                          " WHERE %s " % (" AND ".join(where_clauses)))