Changeset 4625 for MILK/trunk/milk_server/milk_server/controllers/atom_editor/editatom.py

Timestamp:

15/12/08 09:22:56 (12 years ago)

Author:

cbyrom

Message:

Improve error handling in the atom controllers + refactor ndgInterface
to remove code from constructor to allow dependency injection - to
improve flexibility and testability. Also, change ambiguous naming
references in classes to minimise codeword overaps/confusion.

File:

• MILK/trunk/milk_server/milk_server/controllers/atom_editor/editatom.py (modified) (5 diffs)

MILK/trunk/milk_server/milk_server/controllers/atom_editor/editatom.py

@@ -14 +14 @@
 from milk_server.models.form import *
 from milk_server.lib import mailer
-from milk_server.lib.ndgInterface import interface 
+from milk_server.lib.ndgInterface import ndgInterface 
 import milk_server.lib.htmlUtilities as utils
 from milk_server.lib.atomutilities import savePageAndRender
@@ -273 +273 @@
         # quite a lot during editing; ensure you've always got 
         # the latest updates loaded
+        interface = ndgInterface()
         status,x = interface.GetXML(uri, useCache=False)
 
@@ -305 +306 @@
             c.errors = {}
 
-        try:
-            # NB, can get here directly from saveAtom - if there have been errors
-            # - in this case keep original data
-            if not c.atom:
-                self.prepareDataModel(uri)
-        except SystemError, e:
-            return self.__handleError(e)
+        # NB, can get here directly from saveAtom - if there have been errors
+        # - in this case keep original data
+        if not c.atom:
+            self.prepareDataModel(uri)
             
         c.title='Editing [%s]' %c.atom.ndgURI
@@ -367 +365 @@
         '''
         logging.info("Setting up atom edit template")
-        self.prepareEditForm(uri)
-
         try:
+            self.prepareEditForm(uri)
             return savePageAndRender(self.pathInfo, "atom_editor/atom_editor")
         
@@ -376 +373 @@
             c.doc=str(x)
             logging.error("Error retrieving [%s] - XML content: %s" % (uri, e))
-
+        except SystemError, e:
+            return self.__handleError(e)
         except Exception, e:
             errorMessage = traceback.format_exc()