Changeset 2014 for TI02-CSML/branches

Timestamp:

17/01/07 14:33:47 (14 years ago)

Author:

domlowe

Message:

changed cdms id to name, temporarily fixed commas in data string

Location:

TI02-CSML/branches/CSML-v1.0x-ddc

Files:

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

TI02-CSML/branches/CSML-v1.0x-ddc/Examples/parsing/apicalls.py

@@ -3 +3 @@
 import csml
 
-f='Examples/parsing/test.xml'
+f='testedited.xml'
 
 #Initialise the CSML container
@@ -19 +19 @@
 
 #select a feature by name (gml:id)
-print '\n Selecting feature with gml:id = %s' %flist[4]
-feature=csmldoc.getFeature(flist[4])
+print '\n Selecting feature with gml:id = %s' %flist[0]
+feature=csmldoc.getFeature(flist[0])
 
 f#eature 'bestname'
@@ -45 +45 @@
 #define a selection (based on the domain ref/complement)
 #timeSelection=['2881-3-16T0:0:0.0', '2881-4-16T0:0:0.0', '2881-5-16T0:0:0.0', '2881-6-16T0:0:0.0', '2881-7-16T0:0:0.0', '2881-8-16T0:0:0.0', '2881-9-16T0:0:0.0']
-timeSelection=['2794-12-1T0:0:0.0', '2844-12-1T0:0:0.0']
+#timeSelection=['2794-12-1T0:0:0.0', '2844-12-1T0:0:0.0']
+timeSelection=['1901-1-1T0:0:0.0' ,'1901-2-1T0:0:0.0']
 
 spatialSubsetDictionary= {}

TI02-CSML/branches/CSML-v1.0x-ddc/csml/API/ops_GridSeriesFeature.py

@@ -6 +6 @@
 import csml.API.ops_AbstractFeature
 import csml.csmllibs.netCDFWriter
-
+import sys
 
 def testmethod(self):
@@ -39 +39 @@
                 #build domain complement dictionary:
                 valList=[]
-                for val in ordinate.axisValues.split(','):
-                    valList.append(val)
+                for val in ordinate.axisValues.split(' '):
+                    if val !='':
+                        valList.append(val)
                 domaincomp[ordinate.definesAxis]=valList
                 
@@ -118 +119 @@
                 continue #already got data from this file, try next time
             data=comp.getData(fileposition=filePos, times=self.times, **kwargs)
+
             self.files.append(comp.fileName.split()[filePos])
             if fulldata ==[]:
@@ -126 +128 @@
             filesFetched.append(filePos)
         axisorder = data.getAxisIds()  #will need later!
+    #Stephen - at this point the fulldata variable holds the data subset, so you might not need more than this?
+    #print fulldata
+       
     try:
         caltype=self.domain.domainReference.frame.split(':',1)[0]
@@ -132 +137 @@
     except:
         csml.csmllibs.csmltime.setcdtimeCalendar(csml.csmllibs.csmltime.cdtime.DefaultCalendar)
+    
+    
+    
     ### define domain and rangeSet to use for feature in csml document####
     domain=csml.parser.GridSeriesDomain()

TI02-CSML/branches/CSML-v1.0x-ddc/csml/csmllibs/csmldataiface.py

@@ -392 +392 @@
                     kwargs[key]=(0.0, lonMax)
                     sel=cdms.selectors.Selector(**kwargs)
-                    subset1=self.file(self.varobj.name,sel)
+                    subset1=self.file(self.varobj.id,sel)
                     kwargs[key]=(lonMin,359.9999)
                     sel=cdms.selectors.Selector(**kwargs)
-                    subset2=self.file(self.varobj.name,sel)
+                    subset2=self.file(self.varobj.id,sel)
                     #concatenate arrays along longitude
                     longitudeAxis=subset1.getAxisIndex('longitude') # this needs to be more robust test.
@@ -401 +401 @@
                 else:
                     sel=cdms.selectors.Selector(**kwargs)
-                    subset=self.file(self.varobj.name,sel)
+                    subset=self.file(self.varobj.id,sel)
         data = subset
         return data