Changeset 2030 for TI02-CSML

Timestamp:

23/01/07 12:58:10 (13 years ago)

Author:

domlowe

Message:

storage descriptor code working in scanner

Location:

TI02-CSML/trunk/csml

Files:

• csmllibs/csmlbuilder.py (modified) (1 diff)
• csmllibs/csmlfileextracts.py (modified) (1 diff)
• csmllibs/csmlxlink.py (modified) (1 diff)
• parser.py (modified) (1 diff)
• testfiles/basictest.py (modified) (1 diff)

TI02-CSML/trunk/csml/csmllibs/csmlbuilder.py

@@ -27 +27 @@
         self.createFeatureCollection()
         self.createFeatures()
-        self.insertXlinks()
+        #self.insertXlinks()
         #self.closeFC()
         #self.closeDS()

TI02-CSML/trunk/csml/csmllibs/csmlfileextracts.py

@@ -62 +62 @@
             DI.closeFile()      
         #Add all the file extracts to the dataset element
-        print adlist
-        setattr(self.dataset_element, 'fileExtracts', adlist)
-    
+        sd=csml.parser.CSMLStorageDescriptor()
+        sd.descriptors=adlist
+        setattr(self.dataset_element, 'storageDescriptor', sd)
 
 def createSingleExtract(extractType, fileName, variableName, arraySize):

TI02-CSML/trunk/csml/csmllibs/csmlxlink.py

@@ -38 +38 @@
                     else:
                         print 'no, adding %s to dictionary'%xlinkID
-                        xlinkDictionary[xlinkID]=gO.coordAxisValues.coordinateList.CONTENT
-                        #timepositionlist alternative needed..
+                        xlinkDictionary[xlinkID]=(gO.coordAxisValues.coordinateList.CONTENT, csml.csmllibs.csmlextra.getRandomID())
                         
                         

TI02-CSML/trunk/csml/parser.py

@@ -721 +721 @@
     def __init__(self,**kwargs):
         addatts(self,[])
-        children={'descriptors':[[CSML('NetCDFExtract'),CSML('PointFeature'),CSML('AggregatedArray')], 'FileExtract', CSML('descriptor')]}
+        children={'descriptors':[[CSML('NetCDFExtract'),CSML('PointFeature'),CSML('AggregatedArray')], 'FileExtract', CSML('descriptor'),1]}
         addchildren(self,children)
     

TI02-CSML/trunk/csml/testfiles/basictest.py

@@ -31 +31 @@
 #Hopefully the CSML output should be the same as the CSML it read in.
 csmldoc = dataset.toXML()
-    
+  
 #Tidy up and print the CSML document:
 #strCSML= parseString(tostring(csml)).toprettyxml()