[Mpuls-commits] r515 - in wasko/trunk: . waskaweb/lib waskaweb/model

[scm-commit@wald.intevation.org]

Author: torsten
Date: 2009-05-19 11:28:16 +0200 (Tue, 19 May 2009)
New Revision: 515

Modified:
   wasko/trunk/ChangeLog.txt
   wasko/trunk/waskaweb/lib/xmlexport.py
   wasko/trunk/waskaweb/model/casexml.py
Log:
Fixed issue210, issue233


Modified: wasko/trunk/ChangeLog.txt
===================================================================
--- wasko/trunk/ChangeLog.txt	2009-05-18 07:23:20 UTC (rev 514)
+++ wasko/trunk/ChangeLog.txt	2009-05-19 09:28:16 UTC (rev 515)
@@ -1,5 +1,12 @@
-2009-05-21	Torsten Irlaender  <torsten.irlaender at intevation.de> 
+2009-05-19	Torsten Irlaender  <torsten.irlaender at intevation.de> 
 
+	Fixed issue210, issue233:
+
+	* waskaweb/model/casexml.py,
+	  waskaweb/lib/xmlexport.py: Read and write formed XML files in version 3
+
+2009-05-18	Torsten Irlaender  <torsten.irlaender at intevation.de> 
+
 	Fixed issue233:
 
 	* formed/formedtree_web.xml: New formed.

Modified: wasko/trunk/waskaweb/lib/xmlexport.py
===================================================================
--- wasko/trunk/waskaweb/lib/xmlexport.py	2009-05-18 07:23:20 UTC (rev 514)
+++ wasko/trunk/waskaweb/lib/xmlexport.py	2009-05-19 09:28:16 UTC (rev 515)
@@ -35,7 +35,7 @@
 import xml.utils.iso8601 as iso8601
 from   time import mktime
 
-VERSION = 2
+VERSION = 3
 
 
 from pylons import g

Modified: wasko/trunk/waskaweb/model/casexml.py
===================================================================
--- wasko/trunk/waskaweb/model/casexml.py	2009-05-18 07:23:20 UTC (rev 514)
+++ wasko/trunk/waskaweb/model/casexml.py	2009-05-19 09:28:16 UTC (rev 515)
@@ -81,8 +81,12 @@
    WHERE m.id = %(mid)s
 """
 
-VERSION = 2
+CASE_NOT_AVAILABLE = u'''Daten zum Fall '%d' können nicht geladen werden. 
+Bitte stellen Sie sicher, dass Sie die/der Bearbeiterin/Bearbeiter sind, 
+oder dass der Fall Ihnen in Vertretung überantwortet wurde.'''
 
+VERSION = 3
+
 DECODERS = {
     data.RadioNode:    decode_int,
     data.TextAreaLeaf: lambda s: s,
@@ -436,7 +440,7 @@
                 self.cur.execute(SQL_SELECT_ALL_FROM_MASTER % { 'ds_id': ds_id })
                 row = self.cur.fetchone()
                 if not row:
-                    raise XMLImportException(u"Daten zum Fall '%d' können nicht geladen werden." % ds_id)
+                    raise XMLImportException(CASE_NOT_AVAILABLE % ds_id)
                 data = dict(zip([n[0] for n in self.cur.description], map(convert_from_db, row)))
                 create_case = False
             #else: