Changeset 3296 for TI02-CSML/trunk/csml/API/ops_PointSeriesFeature.py

Timestamp:

04/02/08 12:19:28 (12 years ago)

Author:

domlowe

Message:

fixing example parser and point series subsetting of inline content

File:

• TI02-CSML/trunk/csml/API/ops_PointSeriesFeature.py (modified) (4 diffs)

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

@@ -91 +91 @@
     
     
-    fileList=[]
-    if hasattr(self.value.rangeSet, 'valueArray'):
-        fextract=self.value.rangeSet.valueArray.valueComponent.insertedExtract.components
-        uom = self.value.rangeSet.valueArray.valueComponent.insertedExtract.uom
+    #fileList=[]
+        
+    if self.value.rangeSet.quantityList.CONTENT:
+        #inline
+        data=self.value.rangeSet.quantityList.CONTENT.split()[minIndex:maxIndex+1]
+        fillvalue=None
+        units=self.value.rangeSet.quantityList.uom
     else:
-        fextract=self.value.rangeSet.arrayDescriptor.components
-        uom = self.value.rangeSet.arrayDescriptor.uom
-    for f in fextract.fileList.fileNames.CONTENT.split():
-        fileList.append(f)
-    
-    data, fillvalue=fextract.getDataFromChunks(minIndex, maxIndex)
-    
-    units=[uom.CONTENT]
+        #file extract
+        if hasattr(self.value.rangeSet, 'valueArray'):
+            fextract=self.value.rangeSet.valueArray.valueComponent.insertedExtract.components
+            uom = self.value.rangeSet.valueArray.valueComponent.insertedExtract.uom
+        else:
+            fextract=self.value.rangeSet.arrayDescriptor.components
+            uom = self.value.rangeSet.arrayDescriptor.uom
+        #for f in fextract.fileList.fileNames.CONTENT.split():
+            #fileList.append(f)
+        
+        data, fillvalue=fextract.getDataFromChunks(minIndex, maxIndex)
+        
+        units=[uom.CONTENT]
    
     #Now write out the CSML Feature:
@@ -139 +147 @@
     
     totalArraySize=10
-    descriptor=csml.parser.NetCDFExtract(id=sdid,fileName=csml.parser.csString(ncname),variableName=self.name,arraySize=csml.parser.csString(totalArraySize))
-
-    
+    if hasattr(self, 'name'):
+        varname=self.name
+    else:
+        varname=self.id
+    descriptor=csml.parser.NetCDFExtract(id=sdid,fileName=csml.parser.csString(ncname),variableName=csml.parser.csString(varname),arraySize=csml.parser.csString(totalArraySize))
+
     #the parameter of the feature is of type Phenomenon, here href creates "xlink:href=..."
     param=self.parameter
@@ -149 +160 @@
     csmlWrap=csml.csmllibs.csmlfeaturewrap.CSMLWrapper()
     subsettedFeature=csmlWrap.createPointSeriesFeature(value=cvg,parameter=param,location=self.location,featureID=self.id,description=self.description)
-    
       
     
@@ -155 +165 @@
     nc=cdms.open(pathToSubsetNetCDF,'w')
     var=MV.array(data)
-    var.id=self.name.CONTENT
-    var.name=self.name.CONTENT
+    var.id=varname
+    var.name=varname
     var.units=units[0] # hopefully there is just one unit in this list..
     setattr(var, 'missing_value' ,fillvalue)