Changeset 5010

Timestamp:

23/02/09 09:27:17 (12 years ago)

Author:

cbyrom

Message:

Adjust XMLRPC client to eXist to preserve the throwing of Faults if
problems occur whilst deleting records. NB, this mainly occurs because
the record doesn't exist - but we shouldn't really be trying to delete
non-existent records, so it's probably helpful to keep this error.

Location:

ndgCommon/trunk/ndg/common

Files:

• src/clients/xmldb/eXist/xmlrpcclient.py (modified) (2 diffs)
• src/lib/utilities.py (modified) (1 diff)
• src/models/ndgObject.py (modified) (1 diff)
• unittests/clients/xmldb/eXist/testxmlrpcclient.py (modified) (2 diffs)

ndgCommon/trunk/ndg/common/src/clients/xmldb/eXist/xmlrpcclient.py

@@ -219 +219 @@
         '''
         logging.debug("Running remove operation on '%s'" %collectionPath)
-        r=self.xmlrpc.removeCollection(collectionPath)
+        r = self.xmlrpc.removeCollection(collectionPath)
         logging.debug("Remove operation completed on '%s'" %collectionPath)
         return r
@@ -232 +232 @@
         '''
         logging.debug("Running remove operation on '%s'" %docPath)
-        try:
-            r=self.xmlrpc.remove(docPath)
-        except xmlrpclib.Fault, f:
-            logging.error("Error encountered: '%s'" %f)
-            return False
+        r = self.xmlrpc.remove(docPath)
         logging.debug("Remove operation completed on '%s'" %docPath)
         return r

ndgCommon/trunk/ndg/common/src/lib/utilities.py

@@ -23 +23 @@
 esc_chars = {'\xb0':'°','°':'°'}
     
-       
+
 class edict(dict):
     '''An extended dictionary which allows one to set and get values

ndgCommon/trunk/ndg/common/src/models/ndgObject.py

@@ -112 +112 @@
             return
         
-
         self.server=self.config.get('DISCOVERY','default')
         server=self.server

ndgCommon/trunk/ndg/common/unittests/clients/xmldb/eXist/testxmlrpcclient.py

@@ -1 +1 @@
 
-import unittest,os
+import unittest,os, xmlrpclib
 from ndg.common.src.clients.xmldb.eXist.xmlrpcclient import *
 import ndg.common.src.clients.xmldb.eXist.dbconstants as dc
@@ -238 +238 @@
 
     def testInvalidRemoveDoc(self):
-        self.assertFalse(self.client.removeDoc(tc.TEST_FILE_NAME))
+        self.assertRaises(xmlrpclib.Fault, self.client.removeDoc, tc.TEST_FILE_NAME)