Changeset 4843 for ndgCommon/trunk/ndg/common/src/clients/xmldb/eXist/existdbclient.py

Timestamp:

19/01/09 16:51:33 (12 years ago)

Author:

cbyrom

Message:

Include better management of stored reference collections.

File:

• ndgCommon/trunk/ndg/common/src/clients/xmldb/eXist/existdbclient.py (modified) (4 diffs)

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

@@ -414 +414 @@
 
         # create the collection, if it doesn't already exist - NB, this won't overwrite anything
-        if self.collections is None or not self.collections.get(collection):
+        if self.collections is None or not collection in self.collections.values():
             self.createCollections([collection])
             
@@ -422 +422 @@
             logging.error(errorMessage)
             raise SystemError(errorMessage)
+        
+        # update the stored collections info, if being used
+        if self.collections:
+            self.collections[fileName] = collection
         
         logging.info("File added to eXist")
@@ -490 +494 @@
         Get all atom collection paths and store in a dictionary - for easy
         reference when doing lots of things at once
-        @return: dict with key/val of atomID/collectionPath
+        @return: dict with key/val of filename/collectionPath
         '''
         logging.info("Retrieving all atom collection paths")
@@ -506 +510 @@
             collection = member.findtext('{http://www.w3.org/2005/Atom}fileName')
             fileName = collection.split('/')[-1]
-            fileName = fileName.split('.')[0]
+            fileName = fileName.split('.')[0:-1]
+            fileName = '.'.join(fileName)
             dir = '/'.join(collection.split('/')[0:-1])
             colData[fileName] = dir