Changeset 918

Timestamp:

12/05/06 15:57:20 (14 years ago)

Author:

domlowe

Message:

added PPExtract to Parser

Location:

TI02-CSML/trunk/newparser

Files:

• Parser.py (modified) (11 diffs)
• ioDemo.py (modified) (1 diff)

TI02-CSML/trunk/newparser/Parser.py

@@ -1547 +1547 @@
                 elif componentFrag.tag == CSML('GRIBExtract'):
                     self.component.append(GRIBExtract())
+                elif componentFrag.tag == CSML('PPExtract'):
+                    self.component.append(PPExtract())
 ##                else:
 ##                    raise Exception('Unexpected element: "'+componentFrag.tag+'"')
@@ -1578 +1580 @@
                     frag = Element(CSML('NetCDFExtract'))
                     frag = NetCDFExtract.toXML(comp,frag)
+                elif isinstance(comp,PPExtract):
+                    frag = Element(CSML('PPExtract'))
+                    frag = PPExtract.toXML(comp,frag)
                 elif isinstance(comp,GRIBExtract):
                     frag = Element(CSML('GRIBExtract'))
@@ -1675 +1680 @@
         return csmlFrag
 
+class PPExtract(AbstractFileExtract):
+    """CSML class for PPExtract file extract
+    same as NetCDFExtract
+    PPExtract(AbstractFileExtract):
+     +variableName: string
+    """
+    def __init__(self,variableName=None,*args,**kwargs):
+        AbstractFileExtract.__init__(self,*args,**kwargs)
+        if variableName:
+            self.variableName = variableName
+    def fromXML(self,csmlFrag):
+        AbstractFileExtract.fromXML(self,csmlFrag)
+        for frag in csmlFrag.getchildren():
+            if frag.tag == CSML('variableName'):
+                self.variableName = frag.text
+##        else:
+##            raise Exception('Unexpected element: "'+frag.tag+'"')
+        checkMandatory(self, 'variableName')
+    def toXML(self,csmlFrag):
+        csmlFrag = AbstractFileExtract.toXML(self,csmlFrag)
+        if hasattr(self, 'variableName'):
+            frag = Element(CSML('variableName'))
+            frag.text = self.variableName
+            csmlFrag.append(frag)
+        return csmlFrag
+        
 class GRIBExtract(AbstractFileExtract):
     """CSML class for GRIB file extract
@@ -2292 +2323 @@
                         self.axisValues=NetCDFExtract()
                         NetCDFExtract.fromXML(self.axisValues, subFrag)
+                    elif subFrag.tag == CSML ('NASAAmesExtract'):
+                        self.axisValues=NASAAmesExtract()
+                        NASAAmesExtract.fromXML(self.axisValues, subFrag)
+                    elif subFrag.tag == CSML ('GRIBExtract'):
+                        self.axisValues=GRIBExtract()
+                        GRIBExtract.fromXML(self.axisValues, subFrag)
+                    elif subFrag.tag == CSML ('PPExtract'):
+                        self.axisValues=PPExtract()
+                        PPExtract.fromXML(self.axisValues, subFrag)
                 else:
                     self.axisValues=frag.text
@@ -2316 +2356 @@
                 subFrag=Element(CSML('NetCDFExtract'))
                 NetCDFExtract.toXML(self.axisValues,subFrag)
+                frag.append(subFrag)
+            elif isinstance(self.axisValues,NASAAmesExtract):
+                subFrag=Element(CSML('NASAAmesExtract'))
+                NASAAmesExtract.toXML(self.axisValues,subFrag)
+                frag.append(subFrag)
+            elif isinstance(self.axisValues,GRIBExtract):
+                subFrag=Element(CSML('GRIBExtract'))
+                GRIBExtract.toXML(self.axisValues,subFrag)
+                frag.append(subFrag)
+            elif isinstance(self.axisValues,PPExtract):
+                subFrag=Element(CSML('PPExtract'))
+                PPExtract.toXML(self.axisValues,subFrag)
                 frag.append(subFrag)
             else:
@@ -2400 +2452 @@
     def toXML(self,csmlFrag):
          if hasattr(self,'timePositions'):
-            csmlFrag.text=self.timePositions
+            print self.timePositions
+            if  isinstance(self.timePositions, NASAAmesExtract):
+                subFrag=Element(CSML('NASAAmesExtract'))
+                NASAAmesExtract.toXML(self.timePositions,subFrag)
+                csmlFrag.append(subFrag)
+            elif  isinstance(self.timePositions, NetCDFExtract):
+                subFrag=Element(CSML('NetCDFExtract'))
+                NetCDFExtract.toXML(self.timePositions,subFrag)
+                csmlFrag.append(subFrag)
+            elif  isinstance(self.timePositions, GRIBExtract):
+                subFrag=Element(CSML('GRIBExtract'))
+                GRIBExtract.toXML(self.timePositions,subFrag)
+                csmlFrag.append(subFrag)
+            elif  isinstance(self.timePositions, PPExtract):
+                subFrag=Element(CSML('PPExtract'))
+                PPExtract.toXML(self.timePositions,subFrag)
+                csmlFrag.append(subFrag)
+            else:
+                csmlFrag.text=self.timePositions
          if hasattr(self,'frame'):
              csmlFrag.attrib['frame']=self.frame
@@ -2441 +2511 @@
     def toXML(self, csmlFrag):
         if hasattr(self,'val'):
-            csmlFrag.text = self.val
+            if  isinstance(self.val, NASAAmesExtract):
+                subFrag=Element(CSML('NASAAmesExtract'))
+                NASAAmesExtract.toXML(self.val,subFrag)
+                csmlFrag.append(subFrag)
+            elif  isinstance(self.val, NetCDFExtract):
+                subFrag=Element(CSML('NetCDFExtract'))
+                NetCDFExtract.toXML(self.val,subFrag)
+                csmlFrag.append(subFrag)
+            elif  isinstance(self.timePositions, GRIBExtract):
+                subFrag=Element(CSML('GRIBExtract'))
+                GRIBExtract.toXML(self.val,subFrag)
+                csmlFrag.append(subFrag)
+            elif  isinstance(self.val, PPExtract):
+                subFrag=Element(CSML('PPExtract'))
+                PPExtract.toXML(self.val,subFrag)
+                csmlFrag.append(subFrag)
+            else:
+                csmlFrag.text = self.val
         if hasattr(self,'uom'):
            csmlFrag.attrib[('uom')] = self.uom
@@ -2671 +2758 @@
                 self.arrayDescriptor=GRIBExtract()
                 GRIBExtract.fromXML(self.ArrayDescriptor,frag)
+            elif frag.tag == CSML('PPExtract'):
+                self.arrayDescriptor=PPExtract()
+                PPExtract.fromXML(self.ArrayDescriptor,frag)
             elif frag.tag == CSML('AggregatedArray'):
                 self.aggregatedArray=AggregatedArray()
@@ -2699 +2789 @@
                 frag=Element(CSML('GRIBExtract'))
                 GRIBAmesExtract.toXML(self.arrayDescriptor,frag)
+                csmlFrag.append(frag)
+            elif isinstance(self.arrayDescriptor,PPExtract):
+                frag=Element(CSML('PPExtract'))
+                PPAmesExtract.toXML(self.arrayDescriptor,frag)
                 csmlFrag.append(frag)
                 
@@ -3115 +3209 @@
                 self.arrayDescriptors.append(GRIBExtract())
                 self.arrayDescriptors[-1].fromXML(frag)
+            elif frag.tag == CSML('PPExtract'):
+                checkArrayAttrib(self,'arrayDescriptors')
+                self.arrayDescriptors.append(PPExtract())
+                self.arrayDescriptors[-1].fromXML(frag)
 ##            else:
 ##                raise Exception('Unexpected element: "'+frag.tag+'"')
@@ -3153 +3251 @@
                     frag = Element(CSML('GRIBExtract'))
                     frag = GRIBExtract.toXML(arrayDesc,frag)
+                elif isinstance(arrayDesc,PPExtract):
+                    frag = Element(CSML('PPExtract'))
+                    frag = PPExtract.toXML(arrayDesc,frag)
                 csmlFrag.append(frag)
         if hasattr(self,'featureCollection'):

TI02-CSML/trunk/newparser/ioDemo.py

@@ -53 +53 @@
 
 print featureValues
+sys.exit()
 #print type(featureValues)
 #print dir(featureValues)