Changeset 4582

Timestamp:

09/12/08 16:59:38 (12 years ago)

Author:

cbyrom

Message:

Add logic to cope with changes to the Atom structure - to allow granulite files and logos data to be stored + improve error handling.

Location:

exist/trunk/python/ndgUtils

Files:

• lib/granulite.py (modified) (2 diffs)
• models/Atom.py (modified) (2 diffs)

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

@@ -105 +105 @@
         
         # override CSML/CDML data specified in the granulite file with data input directly
+        self.ingestGranuliteFiles = True
         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 granuleAtom:
@@ -253 +255 @@
         if self.PARAMETERS_SECTION in granulite_data:
             self._atom.addParameters(granulite_data[self.PARAMETERS_SECTION])
-            
-        # check for CSML/CDML file input - these data are changed before adding to the granule
-        # - since the file will be stored and referenced in eXist by then
-        if not self._csmlFileName:
-            if self.CSML_SECTION in granulite_data:
-                self.__addCSMLOrCDMLData(granulite_data[self.CSML_SECTION][0], None)
-
-        if not self._cdmlFileName:
-            if self.CDML_SECTION in granulite_data:
-                if self._csmlFileName:
-                    raise ValueError("Cannot specify both CDML and CSML file in granulite config file" + \
-                                     "\nNB, CSML file is generated from the specified CDML file")
-            
-                data = utilities.getTripleData(granulite_data[self.CDML_SECTION][0])
-                self.__addCSMLOrCDMLData(data[0], None)
-                self._datasetID = data[1]
-                self._cdmlTimeAxis = data[2]
+
+        # NB, if running from the web, ignore the CSML/CDML files specified in the granulite
+        if self.ingestGranuliteFiles:
+            # check for CSML/CDML file input - these data are changed before adding to the granule
+            # - since the file will be stored and referenced in eXist by then
+            if not self._csmlFileName:
+                if self.CSML_SECTION in granulite_data:
+                    self.__addCSMLOrCDMLData(granulite_data[self.CSML_SECTION][0], None)
+    
+            if not self._cdmlFileName:
+                if self.CDML_SECTION in granulite_data:
+                    if self._csmlFileName:
+                        raise ValueError("Cannot specify both CDML and CSML file in granulite config file" + \
+                                         "\nNB, CSML file is generated from the specified CDML file")
+                
+                    data = utilities.getTripleData(granulite_data[self.CDML_SECTION][0])
+                    self.__addCSMLOrCDMLData(data[0], None)
+                    self._datasetID = data[1]
+                    self._cdmlTimeAxis = data[2]
             
         if self.DATA_ENTITY_SECTION in granulite_data:

exist/trunk/python/ndgUtils/models/Atom.py

@@ -939 +939 @@
             else:
                 self.ME.responsibleParties.append(attributeValue)
+        elif attributeName == "files":
+            self.addUniqueRelatedLinks(attributeValue)
         else:
             setattr(self, attributeName, attributeValue)
@@ -962 +964 @@
                 authorType= Person.CONTRIBUTOR_TYPE
             obj = Person(personType = authorType)
+        elif attributeName == 'files':
+            obj = Link()
+            objectVals = '%s|%s|%s' \
+                %(self.VTD.getTermCurrentVocabURL(VTD.METADATA_SOURCE_TERM), objectVals, VTD.METADATA_SOURCE_TERM)
 
         if obj: