Changeset 332

Timestamp:

21/05/15 12:03:52 (6 years ago)

Author:

astephen

Message:

Added test for no command-line arguments when ceda-cc is run.
Now it prints the doc string and informs the user of the error.

Also changed "diretory" to "directory" in various places.

Location:

CCCC/trunk

Files:

• ceda_cc/c4.py (modified) (1 diff)
• ceda_cc/ccinit.py (modified) (1 diff)
• ceda_cc/fcc_utils.py (modified) (1 diff)
• updates.txt (modified) (1 diff)

CCCC/trunk/ceda_cc/c4.py

@@ -8 +8 @@
   """
    Wrapper around main() for use with setuptools.
+  """
+  if len(sys.argv) == 1:
+      # Show command-line info and report that you must provide arguments
+      import ccinit
+      print ccinit.__doc__
+      print "\nERROR: Please provide command-line arguments."
+      return
 
-  """
   if sys.argv[1] == '--sum':
       import summary

CCCC/trunk/ceda_cc/ccinit.py

@@ -29 +29 @@
 ceda_cc -p <project> [-f <NetCDF file>|-d <directory containing files>|-D <root of directory tree>] [other options]
 
-With the "-D" option, all files in the directory tree beneath the given diretory will be checked. With the "-d" option, only files in the given directory will be checked.
+With the "-D" option, all files in the directory tree beneath the given directory will be checked. With the "-d" option, only files in the given directory will be checked.
 """
 import sys, os, string, time, logging

CCCC/trunk/ceda_cc/fcc_utils.py

@@ -204 +204 @@
       files.pop( files.index(f) )
       
-# record diretory names at each level
+# record directory names at each level
     if thisLev not in self.dirNames.keys():
        self.dirNames[thisLev] = []

CCCC/trunk/updates.txt

@@ -4 +4 @@
 153c: Debugged amap virtual substitutions for attributes of axes.
 153d: Added mip_id mapping to those recognised in construction of drs dictionary
-153e: Draft correction for CMIP5 diretory path.
+153e: Draft correction for CMIP5 directory path.
 153f: Added tolerance of 0.01 degrees for rotated latitude grid specification.