Changeset 4591 for exist

Timestamp:

11/12/08 09:48:11 (12 years ago)

Author:

cbyrom

Message:

Correctly handle scenario where granulite files are specified online
but with no CSML/CDML file + simplify creation of CSML file.

File:

• exist/trunk/python/ndgUtils/lib/granulite.py (modified) (3 diffs)

exist/trunk/python/ndgUtils/lib/granulite.py

@@ -91 +91 @@
         @keyword datasetID: if using a CDML file, specify the ID of the dataset to use
         - otherwise one will be randomly generated
-        @return csmlDoc, cdmlDoc: the CsmlParser.Dataset object with the csml data in and, 
-        if we're dealing with a CDML doc, return this too
         '''
         logging.info("Creating granulite data model")
@@ -106 +104 @@
         # override CSML/CDML data specified in the granulite file with data input directly
         self.ingestGranuliteFiles = True
+        # NB, empty FieldStorage fields end up as empty strings
         if csmlOrCdmlFile is not None:
-            if not isinstance(csmlOrCdmlFile, cgi.FieldStorage):
-                raise ValueError("Specified CSML/CDML file is not a cgi.FieldStorage object")
-            self.__addCSMLOrCDMLData(csmlOrCdmlFile.filename, csmlOrCdmlFile.value)
             self.ingestGranuliteFiles = False
+            if csmlOrCdmlFile != '':
+                if not isinstance(csmlOrCdmlFile, cgi.FieldStorage):
+                    raise ValueError("Specified CSML/CDML file is not a cgi.FieldStorage object")
+                self.__addCSMLOrCDMLData(csmlOrCdmlFile.filename, csmlOrCdmlFile.value)
+        
 
         if granuleAtom:
@@ -411 +412 @@
         fileName = fileName.split('\\')[-1]
         
-        csmlDoc = self._atom.addCSMLData(self._csmlFileName, \
-                                         self._csmlContent, useCSMLID = self.useCSMLID)
+        self._atom.addCSMLData(self._csmlFileName, \
+                               self._csmlContent, useCSMLID = self.useCSMLID)
         logging.info("Adding CSML file to eXist")
-        self._eXist.createOrUpdateEXistFile(csmlDoc.toPrettyXML(), \
+        self._eXist.createOrUpdateEXistFile(self._csmlContent, \
                                         eXistConnector.NDG_A_COLLECTION_PATH + \
                                         self._atom.ME.providerID + '/', \