erange version 4.0a dev release

[erange.git] / makesitetrack.py

diff --git a/makesitetrack.py b/makesitetrack.py
index c6d0b8ec3d87987950c4876d9e70f4120e9dee0a..6537bea791e3cfd58ccf95c8c89061b14797a07e 100755 (executable)
--- a/makesitetrack.py
+++ b/makesitetrack.py
@@ -3,9 +3,12 @@
 #  ENRAGE
 #
 
-import sys, string, optparse
+import sys
+import string
+import optparse
+from commoncode import getConfigParser, getConfigOption, getConfigBoolOption
 
-print "%prog: version 2.1"
+print "makesitetrack: version 2.2"
 
 
 def main(argv=None):
@@ -14,13 +17,7 @@ def main(argv=None):
 
     usage = "usage: python %prog sitefile outbedfile [--noheader] [--stype fieldID] [--color xx,yy,zz] [--append] [--exploded]"
 
-    parser = optparse.OptionParser(usage=usage)
-    parser.add_option("--noheader", action="store_true", dest="noHeader")
-    parser.add_option("--stype", type="int", dest="stypeID")
-    parser.add_option("--color", dest="color")
-    parser.add_option("--append", action="store_true", dest="append")
-    parser.add_option("--exploded", action="store_false", dest="compact")
-    parser.set_defaults(stypeID=None, color="0,0,0", append=False, compact=True, noHeader=False)
+    parser = makeParser(usage)
     (options, args) = parser.parse_args(argv[1:])
 
     if len(args) < 2:
@@ -33,6 +30,27 @@ def main(argv=None):
     makesitetrack(infile, outfileName, options.stypeID, options.color, options.append, options.compact, options.noHeader)
 
 
+def makeParser(usage=""):
+    parser = optparse.OptionParser(usage=usage)
+    parser.add_option("--noheader", action="store_true", dest="noHeader")
+    parser.add_option("--stype", type="int", dest="stypeID")
+    parser.add_option("--color", dest="color")
+    parser.add_option("--append", action="store_true", dest="append")
+    parser.add_option("--exploded", action="store_false", dest="compact")
+
+    configParser = getConfigParser()
+    section = "makesitetrack"
+    stypeID = getConfigOption(configParser, section, "stypeID", None)
+    color = getConfigOption(configParser, section, "color", "0,0,0")
+    append = getConfigBoolOption(configParser, section, "append", False)
+    compact = getConfigBoolOption(configParser, section, "compact", True)
+    noHeader = getConfigBoolOption(configParser, section, "noHeader", False)
+
+    parser.set_defaults(stypeID=stypeID, color=color, append=append, compact=compact, noHeader=noHeader)
+
+    return parser
+
+
 def makesitetrack(infileName, outFileName, stypeID=None, color="0,0,0", append=False, compact=True, noHeader=False):
     if stypeID is not None:
         doStype = True