[Mpuls-commits] r5232 - in base/trunk: . mpulsweb/model

[scm-commit@wald.intevation.org]

Author: bh
Date: 2011-08-12 15:57:18 +0200 (Fri, 12 Aug 2011)
New Revision: 5232

Modified:
   base/trunk/ChangeLog
   base/trunk/mpulsweb/model/case.py
Log:
* mpulsweb/model/case.py (MPulsXMLImporter.import_case): Return
the new instance tree, if the case was actually loaded, return
None otherwise. This makes import_case behave more like the base
class method it extends. This extension only works because the
base method returns the instance tree and classes derived from
MPulsXMLImporter may derived classes can in turn extend the method
in the same way.


Modified: base/trunk/ChangeLog
===================================================================
--- base/trunk/ChangeLog	2011-08-12 13:39:46 UTC (rev 5231)
+++ base/trunk/ChangeLog	2011-08-12 13:57:18 UTC (rev 5232)
@@ -1,5 +1,15 @@
 2011-08-12  Bernhard Herzog  <bh at intevation.de>
 
+	* mpulsweb/model/case.py (MPulsXMLImporter.import_case): Return
+	the new instance tree, if the case was actually loaded, return
+	None otherwise. This makes import_case behave more like the base
+	class method it extends. This extension only works because the
+	base method returns the instance tree and classes derived from
+	MPulsXMLImporter may derived classes can in turn extend the method
+	in the same way.
+
+2011-08-12  Bernhard Herzog  <bh at intevation.de>
+
 	* mpulsweb/model/case.py (MpulsCase.get_value): Fix doc-string.
 
 2011-08-11  Ludwig Reiter <ludwig.reiter at intevation.de>

Modified: base/trunk/mpulsweb/model/case.py
===================================================================
--- base/trunk/mpulsweb/model/case.py	2011-08-12 13:39:46 UTC (rev 5231)
+++ base/trunk/mpulsweb/model/case.py	2011-08-12 13:57:18 UTC (rev 5232)
@@ -1493,6 +1493,8 @@
                 # logbook for the case
                 import_logbook(tree, cursor, components["tagebuch"])
             self.imported_ids.append(tree.getRootNode().getIdentifier())
+            return tree
+        return None
 
     def import_allowed(self, cursor, components):
         uuid = components["master"].uuid