Changeset 1555

Timestamp:

05/10/06 16:23:02 (14 years ago)

Author:

domlowe

Message:

some changes to allow cdml to be used as data source, not working properly yet though

Location:

TI02-CSML/trunk

Files:

• Examples/parsing/apicalls.py (modified) (1 diff)
• Examples/scanning/mstconfig.cfg (modified) (1 diff)
• csml/API/csmlContainer.py (modified) (1 diff)
• csml/csmllibs/csmldataiface.py (modified) (2 diffs)
• csml/csmllibs/csmldirectory.py (modified) (4 diffs)

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

@@ -22 +22 @@
 feature=csmldoc.getFeature(flist[4])
 
-#feature 'bestname'
+f#eature 'bestname'
 print feature.id
 print feature.description

TI02-CSML/trunk/Examples/scanning/mstconfig.cfg

@@ -4 +4 @@
 
 [files]
-root: /home/users/domlowe/SVNWorkingCopy/trunk/Scanner/msttest
+root: /home/users/domlowe/SVNWorkingCopy/trunk/Examples/scanning/msttest
 mapping: oneonly
 output:mstout.xml

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

@@ -53 +53 @@
         #need to think about whether it is best to append the file object or just a path to the file
         self.ncfiles.append(ncfile)
-    
+
+        
     def getContents(self):
         self.ds.arrayDescriptors=self.ad

TI02-CSML/trunk/csml/csmllibs/csmldataiface.py

@@ -43 +43 @@
                         return cdunifInterface()
                 elif fileExtension == 'ctl':
+                        return cdunifInterface()
+                elif fileExtension == 'xml':
                         return cdunifInterface()
                 else:
@@ -313 +315 @@
             self.extractType = 'GRIBExtract'
             self.extractPrefix = '_gribextract_'
-
+        elif fileExtension == 'xml': 
+            self.extractType = 'NetCDFExtract'  #okay this isn't true, but ok for testing
+            self.extractPrefix = '_ncextract__' 
     def getListOfAxes(self):
         axes=self.file.dimensions.keys()

TI02-CSML/trunk/csml/csmllibs/csmldirectory.py

@@ -3 +3 @@
 import nappy
 import sys
+import string
 
 class DirectoryTree(object):
@@ -99 +100 @@
         fileExtension = str(filename)[-3:]
         supported = False
+        
         try:
             if fileExtension == '.nc':
@@ -106 +108 @@
             elif fileExtension == 'ctl':
                     supported = True
+            elif fileExtension == 'xml':
+            #this could be a CDML file. Only way to see is to open it.
+                f=open(filename, 'r')
+                f.readline() #read first line, now read docstring on second line
+                line2=f.readline()
+                if string.find(line2,'http://www-pcmdi.llnl.gov/software/cdms/cdml.dtd') > -1:
+                    supported = True
+                    f.close()
             elif nappy.readFFI(filename) in [1001,1010,1020,2010,2110,2160,2310,3010,4010]:
                     supported = True
@@ -111 +121 @@
                 #the nappy.readFFI function can fail if permissions are wrong (for example)
                 supported=False
-        return supported
+        return supported