[Mpuls-commits] r488 - in wasko/trunk: . waskaweb/controllers waskaweb/converter

[scm-commit@wald.intevation.org]

Author: teichmann
Date: 2009-04-07 15:26:03 +0200 (Tue, 07 Apr 2009)
New Revision: 488

Modified:
   wasko/trunk/ChangeLog.txt
   wasko/trunk/waskaweb/controllers/caselifetime.py
   wasko/trunk/waskaweb/converter/wasko_v1v2.py
Log:
Fixed issue165


Modified: wasko/trunk/ChangeLog.txt
===================================================================
--- wasko/trunk/ChangeLog.txt	2009-04-07 12:48:12 UTC (rev 487)
+++ wasko/trunk/ChangeLog.txt	2009-04-07 13:26:03 UTC (rev 488)
@@ -1,3 +1,11 @@
+2009-04-07	Sascha L. Teichmann	<teichmann at intevation.de>
+
+	Fixed issue165
+
+	* waskaweb/converter/wasko_v1v2.py: Compared string with int :-/
+
+	* waskaweb/controllers/caselifetime.py: Unrelated: Fixed usage of traceback.
+
 2009-04-07	Torsten Irlaender  <torsten.irlaender at intevation.de> 
 
 	Renamed label for "Datum Genehmigung Wiederaufnahme"

Modified: wasko/trunk/waskaweb/controllers/caselifetime.py
===================================================================
--- wasko/trunk/waskaweb/controllers/caselifetime.py	2009-04-07 12:48:12 UTC (rev 487)
+++ wasko/trunk/waskaweb/controllers/caselifetime.py	2009-04-07 13:26:03 UTC (rev 488)
@@ -117,7 +117,7 @@
         to_fields.data['cm_dok_datum_beendigung'] = from_fields.data['datum_cm_ende']
         to_fields.storeData(to_id)
     except:
-        print traceback.print_exc(file=sys.stderr)
+        traceback.print_exc(file=sys.stderr)
 
 def save_formdata(id, data):
     # Füge alte params aus dem Dialog in der verwaltung hinzu und schreibe alles weg
@@ -244,7 +244,7 @@
                 c.form_result['cm_datum_verlaengerung_2'] = dd_mm_YYYY(ende_verl1+timedelta(days=31*3))
 
         except Exception, err:
-            print traceback.print_exc(file=sys.stderr) 
+            traceback.print_exc(file=sys.stderr) 
             c.form_result['cm_wiederauf_datum_bis_1'] = ''
             c.form_result['cm_datum_verlaengerung_1'] = ''
             c.form_result['cm_datum_verlaengerung_2'] = ''

Modified: wasko/trunk/waskaweb/converter/wasko_v1v2.py
===================================================================
--- wasko/trunk/waskaweb/converter/wasko_v1v2.py	2009-04-07 12:48:12 UTC (rev 487)
+++ wasko/trunk/waskaweb/converter/wasko_v1v2.py	2009-04-07 13:26:03 UTC (rev 488)
@@ -116,7 +116,7 @@
         if not self.nat_staat is None:
             nat_staat = decode_int(self.nat_staat)
             if master_loader.version < 2:
-                if nat_staat == '29': # deutsch
+                if nat_staat == 29: # deutsch
                     nat_staat = 1
                 elif nat_staat != -1 or nat_staat != -3:
                     nat_staat = 2 # andere