Changeset 1523

Timestamp:

15/09/06 11:55:59 (14 years ago)

Author:

domlowe

Message:

more changes related to csmlContainer class

Location:

TI02-CSML/trunk

Files:

• Examples/parsing/apicalls.py (modified) (2 diffs)
• csml/API/csmlContainer.py (modified) (5 diffs)
• csml/API/ops_GridSeriesFeature.py (modified) (2 diffs)

TI02-CSML/trunk/Examples/parsing/apicalls.py

@@ -6 +6 @@
 
 #Initialise the CSML container
-csmlContainer=csml.API.csmlContainer.Container("mycsmldoc", "mymetadatastring")
+csmlContainer=csml.API.csmlContainer.Container(csmlpath='myfile.xml',docID="mycsmldoc_1", metadata="mymetadatastring")
 
 #Initialise and parse the dataset
@@ -53 +53 @@
 
 #request subsetted data from feature (can set paths here)
-feature.subsetToGridSeries(csmlContainer, timeSelection,  csmlpath='myfile.xml', ncpath='myfile.nc',**spatialSubsetDictionary)
+feature.subsetToGridSeries(csmlContainer, timeSelection,  ncpath='myfile.nc',**spatialSubsetDictionary)
 csmlbundle=csmlContainer.getContents()
 
-print csmlbundle
+print 'CSML %s'%csmlbundle[0] # csml document
 
 #parse and pretty print the result

TI02-CSML/trunk/csml/API/csmlContainer.py

@@ -5 +5 @@
     '''CSMLContainer object is used to hold features before generating a CSML document. This is useful because it allows you to subset several features sequentially then build a single CSML document containing all the subsetted features '''
     
-    def __init__(self,docID, docMetaDataProperty):
+    def __init__(self,csmlpath='myfile.xml',docID='none',metadata='unspecified'):
+        self.csmlpath=csmlpath
         ''' Initialise CSML Dataset and FeatureCollection and populate with basic Metadata'''
         '''
@@ -16 +17 @@
         self.fc=csml.parser.FeatureCollection()
         #Set attributes of dataset
-        #if docMetaDataProperty is a URI, set it as href attribute if MetaDataProperty instance,
+        #if 'metadata' is a URI, set it as href attribute if MetaDataProperty instance,
         #else set it as a text attribute of a MetaDataProperty instance.
         mdp=csml.parser.MetaDataProperty()
-        if csml.parser_extra.isURI(docMetaDataProperty):
-            mdp.href=docMetaDataProperty
+        if csml.parser_extra.isURI(metadata):
+            mdp.href=metadata
         else: 
-            mdp.text = [docMetaDataProperty]
+            mdp.text = [metadata]
         self.ds.metaDataProperty= [mdp]
         #set the id
@@ -35 +36 @@
         '''containerContents contains the CSML Document (first item) and then any NetCDF files that are to be delivered with the document '''
         self.containerContents=[]
-        
+        self.ncfiles=[]
     
     def appendFileExtract(self, fileextract):
@@ -51 +52 @@
         #append NetCDF file object to containerContents
         #need to think about whether it is best to append the file object or just a path to the file
-        self.containerContents.append(ncfile)
+        self.ncfiles.append(ncfile)
     
     def getContents(self):
@@ -62 +63 @@
         strCSML=csml.parser_extra.removeInlineNS(strCSML)
         self.containerContents.append(strCSML)
+        for ncfile in self.ncfiles:
+            self.containerContents.append(ncfile)
         return self.containerContents

TI02-CSML/trunk/csml/API/ops_GridSeriesFeature.py

@@ -56 +56 @@
     #MUST be supplied with a CSMLContainer object to store the subsetted feature in
     
-    if csmlpath is not None:
-        pathToSubsetCSML = csmlpath
-    else:
-        pathToSubsetCSML='temp.xml'
+    pathToSubsetCSML = container.csmlpath
     if ncpath is not None:
         pathToSubsetNetCDF=ncpath
@@ -208 +205 @@
     nc.closeFinishedFile()
     container.attachNetCDFFile(nc)
-    return pathToSubsetCSML,pathToSubsetNetCDF, totalArraySize