Changeset 3288 for TI02-CSML/trunk

Timestamp:

30/01/08 11:59:33 (12 years ago)

Author:

domlowe

Message:

more tidying of scanner

Location:

TI02-CSML/trunk/csml

Files:

• csmllibs/csmlbuilder.py (modified) (2 diffs)
• csmlscan.py (modified) (6 diffs)
• testfiles/gridseries/subset.py (modified) (1 diff)

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

@@ -34 +34 @@
             self.directory=self.selection[0]
         else:
+            self.selection=None
             self.directory = directory # top level directory containing data files   
-        self.selection
         self.csmlfeaturetype  = csmlft 
         self.mapping = mapping 
@@ -56 +56 @@
             #this is caused by an incorrect directory name
             print 'error: Cannot find a config file at this location.'
-            sys.exit()
+            raise SystemExit
         #self.addSecurity()
         self.createFeatureFileMap()

TI02-CSML/trunk/csml/csmlscan.py

@@ -99 +99 @@
     config = ConfigParser.ConfigParser()
     #Get command line arguments
-    print sys.argv
+    #if len(sys.argv) ==1:
+        #print 'No arguments passed to csmlscan. Run "csmlscan --help" for more info.'
+        #raise SystemExit
     if optargs:
         #if called as main(args) from another python module use these args, else use 
@@ -107 +109 @@
             opts, args = getopt.getopt(sys.argv[1:], "c:d:i:a:f:xt:m:po:s:v:T:h", ["configfile=","directory=","id=","minaxes=", "csmlfeaturetype=", "exitafterconfig","timedimension=", "filemapping=",  "printscreen", "outputfile=", "spatialstorage=","valuestorage=","timestorage=","help"])
     except getopt.error, msg:
-            print "Invalid options, use --help for help"
-            sys.exit()
+            print 'Invalid options, use "csmlscan --help" for help'
+            raise SystemExit
     hasConfig=False
     configTest=False
@@ -173 +175 @@
     
     else: #no config file, get command line args
-        for o, v in opts:
-            print o,v
         for o, v in opts:
             if o in ("-d", "--directory"):
@@ -200 +200 @@
             elif o in ("-h", "--help"):
                 print usage
-                sys.exit()      
+                raise SystemExit
         if args is not []:
             SELECTION=args
@@ -239 +239 @@
         if configTest==True:
             #don't actually start the scan
-            sys.exit()
+            print '\n Abandoning scan, remove "-x" flag to scan for real'
+            raise SystemExit
             
             
@@ -262 +263 @@
 
 
-
-
-
-
-
-
-
-

TI02-CSML/trunk/csml/testfiles/gridseries/subset.py

@@ -55 +55 @@
 
     #csmlContainer.add(feature.subsetToGridSeries(outputdir,ncname='mygridseries.nc',**subsetDictionary))
-#csmlContainer.add(feature.subsetToGridSeries(outputdir,ncname='mygridseries.nc',latitude=(-90,90), longitude=(-180,180),time=('2804-12-01T00:00:00.0','2904-12-01T00:00:00.0')))
+csmlContainer.add(feature.subsetToGridSeries(outputdir,ncname='mygridseries.nc',latitude=(-90,90), longitude=(-180,180),time=('2804-12-01T00:00:00.0','2904-12-01T00:00:00.0')))
 
 #csmlContainer.add(feature.subsetToGridSeries(outputdir,ncname='mygridseries.nc',latitude=(60), longitude=(180),time=('2804-12-01T00:00:00.0','2904-12-01T00:00:00.0')))