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

[scm-commit@wald.intevation.org]

Author: teichmann
Date: 2009-03-10 11:49:41 +0100 (Tue, 10 Mar 2009)
New Revision: 351

Modified:
   wasko/trunk/ChangeLog.txt
   wasko/trunk/waskaweb/model/casexml.py
Log:
XML import: Forget code path in refactoring for converter plug-in.



Modified: wasko/trunk/ChangeLog.txt
===================================================================
--- wasko/trunk/ChangeLog.txt	2009-03-10 10:38:26 UTC (rev 350)
+++ wasko/trunk/ChangeLog.txt	2009-03-10 10:49:41 UTC (rev 351)
@@ -1,3 +1,8 @@
+2009-03-10	Sascha L. Teichmann	<teichmann at intevation.de>
+
+	* waskaweb/model/casexml.py: Forget code path in refactoring
+	  for converter plug-in.
+
 2009-03-10	Torsten Irlaender  <torsten.irlaender at intevation.de> 
 
 	Fixed rendering of useroverview

Modified: wasko/trunk/waskaweb/model/casexml.py
===================================================================
--- wasko/trunk/waskaweb/model/casexml.py	2009-03-10 10:38:26 UTC (rev 350)
+++ wasko/trunk/waskaweb/model/casexml.py	2009-03-10 10:49:41 UTC (rev 351)
@@ -206,7 +206,7 @@
             old = get_logbuch_ids_from_uuid(cur, self.uuid)
             if old:
                 if old[1] != ds_id:
-                    raise StandardError(u'UUID gehört zum falschen Datensatz.')
+                    raise XMLImportException(u'UUID gehört zum falschen Datensatz.')
                 lid = old[0]
 
         if lid is None:
@@ -392,11 +392,11 @@
             ds_id = get_id_for_uuid(self.cur, 'master', self.uuid)
             if not ds_id is None:
                 #print >> sys.stderr, "case %d already exists" % ds_id
-                cur.execute(SQL_SELECT_ALL_FROM_MASTER % { 'ds_id': ds_id })
+                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)
-                data = dict(zip([n[0] for n in cur.description], map(convert_from_db, row)))
+                data = dict(zip([n[0] for n in self.cur.description], map(convert_from_db, row)))
                 create_case = False
             #else:
             #    print >> sys.stderr, "case with uuid '%s' does not exists" % repr(