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

[scm-commit@wald.intevation.org]

Author: teichmann
Date: 2009-04-03 16:15:30 +0200 (Fri, 03 Apr 2009)
New Revision: 473

Modified:
   wasko/trunk/ChangeLog.txt
   wasko/trunk/waskaweb/converter/wasko_v1v2.py
Log:
Fixed issue128


Modified: wasko/trunk/ChangeLog.txt
===================================================================
--- wasko/trunk/ChangeLog.txt	2009-04-03 13:18:25 UTC (rev 472)
+++ wasko/trunk/ChangeLog.txt	2009-04-03 14:15:30 UTC (rev 473)
@@ -1,5 +1,11 @@
 2009-04-02	Sascha L. Teichmann <teichmann at intevation.de>
 
+	Fix for issue128
+
+	* waskaweb/converter/wasko_v1v2.py: fields were prefix with 'f_'.
+
+2009-04-02	Sascha L. Teichmann <teichmann at intevation.de>
+
 	partial fix for issue106. Removed 'Unterstuetzungsangebote'
 	from statements list.
 

Modified: wasko/trunk/waskaweb/converter/wasko_v1v2.py
===================================================================
--- wasko/trunk/waskaweb/converter/wasko_v1v2.py	2009-04-03 13:18:25 UTC (rev 472)
+++ wasko/trunk/waskaweb/converter/wasko_v1v2.py	2009-04-03 14:15:30 UTC (rev 473)
@@ -69,26 +69,26 @@
 class WaskoV1V2(object):
 
     def __init__(self):
-        self.data          = {}
-        self.nat_staat     = None
-        self.f_kf_meth_c_1 = None
-        self.f_kf_meth_f_1 = None
+        self.data        = {}
+        self.nat_staat   = None
+        self.kf_meth_c_1 = None
+        self.kf_meth_f_1 = None
 
 
     def reset(self):
         self.data.clear()
-        self.nat_staat     = None
-        self.f_kf_meth_c_1 = None
-        self.f_kf_meth_f_1 = None
+        self.nat_staat   = None
+        self.kf_meth_c_1 = None
+        self.kf_meth_f_1 = None
 
     def eat(self, name, attrs, value):
 
-        if name == 'f_kf_meth_c_1':
-            self.f_kf_meth_c_1 = value
+        if name == 'kf_meth_c_1':
+            self.kf_meth_c_1 = value
             return True
 
-        if name == 'f_kf_meth_f_1':
-            self.f_kf_meth_f_1 = value
+        if name == 'kf_meth_f_1':
+            self.kf_meth_f_1 = value
             return True
 
         if name == 'nat_staat':
@@ -107,11 +107,11 @@
 
     def finish(self, master_loader):
 
-        if not self.f_kf_meth_c_1 is None \
-        or not self.f_kf_meth_f_1 is None:
-            if not self.f_kf_meth_f_1 is None: value = self.f_kf_meth_f_1
-            else:                              value = self.f_kf_meth_c_1
-            master_loader.data.append(('f_kf_meth_f_1', value))
+        if not self.kf_meth_c_1 is None \
+        or not self.kf_meth_f_1 is None:
+            if not self.kf_meth_f_1 is None: value = self.kf_meth_f_1
+            else:                            value = self.kf_meth_c_1
+            master_loader.data.append(('kf_meth_f_1', value))
 
         if not self.nat_staat is None:
             nat_staat = decode_int(self.nat_staat)