Changeset 1485 for TI02-CSML

Timestamp:

06/09/06 10:23:22 (13 years ago)

Author:

domlowe

Message:

more module moves

Location:

TI02-CSML/trunk/csml

Files:

• API/ops_AbstractFileExtract.py (modified) (2 diffs)
• API/ops_Dataset.py (modified) (2 diffs)
• API/ops_GridSeriesFeature.py (modified) (7 diffs)
• csmllibs/csmlDocument.py (moved) (moved from TI02-CSML/trunk/csml/API/CSMLDocument.py)
• parser_extra.py (modified) (2 diffs)

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

@@ -1 +1 @@
 ''' ops_AbstractFileExtract  contains operations for AbstractFileExtracts'''
-import sys
+import csml.csmllibs.csmldataiface
 
 def testmethod(self):
@@ -21 +21 @@
         file=self.fileName
     #open the file
-    DI = csmldataiface.DataInterface()
+    DI = csml.csmllibs.csmldataiface.DataInterface()
     DI=DI.getUnknownInterfaceType(file)
     DI.openFile(file)

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

@@ -3 +3 @@
 import codecs
 import csml.csmllibs.xmlEncoding
+import csml.parser_extra
 
 def testmethod(self):
@@ -16 +17 @@
     f.close()
     #parse with correct encoding
-    tree = parser_extra.encodingParser(csmlfile,encoding)
+    tree = csml.parser_extra.encodingParser(csmlfile,encoding)
     self.fromXML(tree.getroot())
-    self =parser_extra.ParserPostProcessor(self).resolveReferences()
+    self =csml.parser_extra.ParserPostProcessor(self).resolveReferences()
     
 def getSecurity(self):

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

@@ -1 +1 @@
 ''' ops_GridSeriesFeature  contains operations for GridSeriesFeatures'''
-#from API import NetCDFWriter
-from CSMLDocument import *
-from Scientific.IO.NetCDF import *  #use this instead of cdms for now for it's simple write interface..
+
 from Numeric import *
+import csml.parser
+import csml.csmllibs.csmltime
+import csml.csmllibs.csmlDocument
+import csml.API.ops_AbstractFeature
 
 
@@ -16 +18 @@
     #Inspects a time position list for the domain reference.
     #TODO, does not handle a file extract in place of a list.
-    if isinstance(self.domain.domainReference,Parser.TimePositionList):
+    if isinstance(self.domain.domainReference,csml.parser.TimePositionList):
         time = {}
         time['t'] = self.domain.domainReference.timePositions
@@ -30 +32 @@
     dc = self.domain.domainComplement
     #dc should be a grid!
-    if isinstance(dc, Parser.Grid):
+    if isinstance(dc, csml.parser.Grid):
         for ordinate in dc.ordinates:
             domaincomp[ordinate.definesAxis]=ordinate.axisValues.getData()
@@ -92 +94 @@
         self.times=[]
         for time in dr['t'].split():
-            timeok=ops_AbstractFeature.__compareTimes(tone,time,ttwo)
+            timeok=csml.API.ops_AbstractFeature.__compareTimes(tone,time,ttwo)
             if timeok ==1:
                 self.times.append(time)
@@ -122 +124 @@
         caltype=self.domain.domainReference.frame.split(':',1)[0]
         calunits=self.domain.domainReference.frame.split(':',1)[1]
-        csmltime.setcdtimeCalendar(caltype)
+        csml.csmllibs.csmltime.setcdtimeCalendar(caltype)
     except:
-        csmltime.setcdtimeCalendar(csmltime.cdtime.DefaultCalendar)
+        csml.csmllibs.csmltime.setcdtimeCalendar(csmltime.cdtime.DefaultCalendar)
     ### define domain and rangeSet to use for feature in csml document####
-    domain=Parser.GridSeriesDomain()
-    domain.domainReference=Parser.TimePositionList(timePositions=strTimes)
-    grid=Parser.Grid()
+    domain=csml.parser.GridSeriesDomain()
+    domain.domainReference=csml.parser.TimePositionList(timePositions=strTimes)
+    grid=csml.parser.Grid()
     #dc = self.getDomainComplement()
     ordinates= []
@@ -138 +140 @@
         arraySize=0
         i=i+1
-        god=Parser.GridOrdinateDescription()
+        god=csml.parser.GridOrdinateDescription()
         god.gridAxesSpanned='dim%s'%i
         god.sequenceRule='+x+y+z'
@@ -171 +173 @@
     grid.ordinates=ordinates
     domain.domainComplement=grid
-    rangeSet=Parser.RangeSet()
-    rangeSet.arrayDescriptor=Parser.NetCDFExtract(id=self.id,fileName=pathToSubsetNetCDF,variableName=self.id,arraySize=[arraySize])
+    rangeSet=csml.parser.RangeSet()
+    rangeSet.arrayDescriptor=csml.parser.NetCDFExtract(id=self.id,fileName=pathToSubsetNetCDF,variableName=self.id,arraySize=[arraySize])
 
     #### write csml document ##### 
-    csmldoc=CSMLDocument("mydoc", "mymetadata")
+    csmldoc=csml.csmllibs.csmlDocument.CSMLDocument("mydoc", "mymetadata")
     csmldoc.addGridSeriesFeature(domain,rangeSet,datasetID="A",featureID="B",description="C")
     csmldoc=csmldoc.consolidate()

TI02-CSML/trunk/csml/parser_extra.py

@@ -91 +91 @@
 class ParserPostProcessor:
     def __init__(self,dataset):
-        if isinstance(dataset,Parser.Dataset):
+        if isinstance(dataset,csml.parser.Dataset):
             self.dataset=dataset
         else: 
@@ -136 +136 @@
                 if hasattr (feature, 'domain'):
                     if hasattr(feature.domain, 'domainComplement'):
-                        if isinstance(feature.domain.domainComplement, Parser.Grid):
+                        if isinstance(feature.domain.domainComplement, csml.parser.Grid):
                                 for ordinate in feature.domain.domainComplement.ordinates:
                                     #search arrayDescriptors for a match.