Changeset 1380 for TI02-CSML

Timestamp:

10/08/06 15:23:02 (13 years ago)

Author:

domlowe

Message:

propagating additional args/configs through Scanner code

Location:

TI02-CSML/trunk/Scanner

Files:

• csmllibs/csmlbuilder.py (modified) (3 diffs)
• csmllibs/csmlfeaturetypes.py (modified) (1 diff)
• csmllibs/csmlfileextracts.py (modified) (3 diffs)
• csmlscan.py (modified) (4 diffs)
• sampleconfig.cfg (modified) (2 diffs)

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

@@ -16 +16 @@
     #this class contains all the method calls to create and populate a csmldoc
     #it needs to be provided with several bits of information to be able to do this.
-    def __init__(self,directory,csmlft, mapping, timedimension ,outputfile,printscreen):
+    def __init__(self,directory,csmlft, mapping, timedimension ,outputfile,printscreen,timestorage,spatialstorage,valuestorage):
         self.directory = directory # top level directory containing data files 
         self.csmlfeaturetype  = csmlft 
@@ -23 +23 @@
         self.outputfile=outputfile
         self.printscreen=printscreen
+        self.timestorage=timestorage
+        self.spatialstorage=spatialstorage
+        self.valuestorage=valuestorage
         self.csml = None  # csml object holds the csml document in memory.
         self.ds_element = None #<Dataset> tag, root node.
@@ -88 +91 @@
     def makeFileExtracts(self):
         print "make FEs"
-        feBuilder =csmllibs.csmlfileextracts.fileExtractBuilder( self.ds, self.ffmap)
-        #self.csml = feBuilder.csmldoc
-        self.ds = feBuilder.dataset_element
-        #todo, remember ds == dataset_element in this file
-        self.extractType = feBuilder.extractType
-        self.extractPrefix  = feBuilder.extractPrefix
-        self.extractDictionary=feBuilder.fileExtractDictionary
+        if self.spatialstorage=='fileextract':
+            feBuilder =csmllibs.csmlfileextracts.fileExtractBuilder( self.ds, self.ffmap, self.timedimension)
+            self.ds = feBuilder.dataset_element
+            self.extractType = feBuilder.extractType
+            self.extractPrefix  = feBuilder.extractPrefix
+            self.extractDictionary=feBuilder.fileExtractDictionary
 
     def createFeatureCollection(self):

TI02-CSML/trunk/Scanner/csmllibs/csmlfeaturetypes.py

@@ -370 +370 @@
                                 #create a file extract link for long lists
                                 arraySize=len(measuredvalues)*len(listOfFiles) 
+                                #TODO this needs to be able to handle inline, use VALUESTORAGE to determine which to use:
                                 fextract=csmllibs.csmlfileextracts.createSingleExtract(self.extractType,filenames,allVarNames[i],arraySize)
                                 qlist = csmllibs.Parser.MeasureOrNullList(val=fextract)

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

@@ -6 +6 @@
 import sys
 class fileExtractBuilder:
-    def __init__(self, dataset_element, ffmap):
+    def __init__(self, dataset_element, ffmap, timedim):
         self.dataset_element=dataset_element
         self.ffmap=ffmap
-        self.createFileExtracts()
-    
-    def createFileExtracts(self):
-        #print "REPRESENTATIVE FILES:"
-        #print self.ffmap.getRepresentativeFiles()
-        
-        #given a featurefilemap object, create file extracts from the "representativeFiles"     
-        #used to store extract/filename/variable relationship
-        #referenced when creating features
-        self.fileExtractDictionary={}
-    
+        self.fileExtractDictionary={} #used to store extract/filename/variable relationship
+        self.createFileExtractsForAxes()
+
+    def createFileExtractsForAxes(self):
+        #given a featurefilemap object, create file extracts for the axes from the "representativeFiles"        
+            
         fileid=0  #used to distinguish extract names for similar variables from different files
         #adlist is an empty list object to hold CSML ArrayDescriptors eg. NetCDFExtract, GRIBExtract etc
@@ -26 +21 @@
             fileid=fileid+1
             filename=repfile.getRepresentativeFileName()
-            #print 'representative file:'
-            #print repfile.getRepresentativeFileName()
-            #print 'feature type:'
-            #print repfile.getFeatureType()     
             DI = csmllibs.csmldataiface.DataInterface()
             DI = DI.getUnknownInterfaceType(filename)
@@ -39 +30 @@
             allDimNames=DI.getListOfAxes()
             numDomains=len(allDimNames)
+            print allDimNames
             for j in range (0, len(allDimNames)):
-#                 print self.extractType
-#                 print self.extractPrefix
                 if self.extractType=='NASAAmesExtract':
                     arrayDescriptor=csmllibs.Parser.NASAAmesExtract()

TI02-CSML/trunk/Scanner/csmlscan.py

@@ -108 +108 @@
     MAPPING=None
     TIMEDIMENSION=None
+    TIMESTORAGE='inline'
+    VALUESTORAGE='fileextract'
+    SPATIALSTORAGE='fileextract'
+    
     #...
     if hasConfig == True:
@@ -119 +123 @@
         SRSNAME = config.getConfigNoError('SpatialReference', 'srs')
         TIMEDIMENSION=config.getConfigNoError('time','timedimension')
+        TIMESTORAGE=config.getConfigNoError('time','timestorage')
+        VALUESTORAGE=config.getConfigNoError('values','valuestorage')
+        SPATIALSTORAGE=config.getConfigNoError('spatialaxes','spatialstorage')
         
         if configTest==True:
@@ -133 +140 @@
             print '\n SpatialReference:srs =%s'%SRSNAME
             print '\n time:timedimension =%s'%TIMEDIMENSION
+            print '\n time:timestorage =%s'%TIMESTORAGE
+            print '\n spatialaxes:spatialstorage =%s'%SPATIALSTORAGE
+            print '\n values:valuestorage =%s'%VALUESTORAGE
             sys.exit()
     
@@ -172 +182 @@
     #build CSML document
     print ROOTDIRECTORY
-    csmldataset=csmllibs.csmlbuilder.csmlBuilder(ROOTDIRECTORY,FEATURETYPE,MAPPING,TIMEDIMENSION, OUTPUTFILE, PRINTSCREEN)
+    csmldataset=csmllibs.csmlbuilder.csmlBuilder(ROOTDIRECTORY,FEATURETYPE,MAPPING,TIMEDIMENSION, OUTPUTFILE, PRINTSCREEN,TIMESTORAGE,SPATIALSTORAGE,VALUESTORAGE)
     csmldataset.build()
 

TI02-CSML/trunk/Scanner/sampleconfig.cfg

@@ -9 +9 @@
 printscreen:1
 
+[spatialaxes]
+spatialstorage:inline
+
+[values]
+valuestorage:fileextract
+
 [SpatialReference]
 srs: EPSG 4326
@@ -14 +20 @@
 [time]
 timedimension: t
+timestorage:inline
 
 [outputfile]