[Swift-commit] r4353 - trunk/bin

[skenny at ci.uchicago.edu]

Author: skenny
Date: 2011-04-13 01:59:33 -0500 (Wed, 13 Apr 2011)
New Revision: 4353

Modified:
   trunk/bin/chxml
Log:
determines location of sites file and checks that it is well-formed

Modified: trunk/bin/chxml
===================================================================
--- trunk/bin/chxml	2011-04-13 05:18:04 UTC (rev 4352)
+++ trunk/bin/chxml	2011-04-13 06:59:33 UTC (rev 4353)
@@ -3,7 +3,7 @@
 # given a filename chxml will ensure it is well-formed xml and
 # contains essential swift attributes
 
-import xml.parsers.expat,sys
+import xml.parsers.expat,sys,os,commands
 from glob import glob
 
 def parsefile(file):
@@ -19,20 +19,45 @@
     print 'End element:', name
     endTags.append(name)
 
-for arg in sys.argv[1:]:
-    for filename in glob(arg):
-        try:
-            parsefile(filename)
-            print "%s is well-formed" % filename
-        except Exception, e:
-            print "Error: there is a problem with your sites file"
-            print "%s is %s" % (filename, e)
-            sys.exit()
+# parse args to find sites.xml file
+
+sites_file = ""
+argstr = sys.argv
+
+if len(argstr)<2:
+    print "please specify a sites file"
+    sys.exit()
+i = 0
+for o in argstr:
+    if o == "'-sites.file'":
+        sites_file = argstr[i+1].split("'")[1]
+    elif o == "'-config'":
+        config_file = open(argstr[i+1].split("'")[1],"r")
+        for line in config_file.readlines():
+            if line.strip().startswith('#'):
+                continue
+            if line.find("sites.file")>-1:
+                print "line is "+line
+                sites_file = line.split("=")[1].strip()
+    i = i+1                    
+if (sites_file == ""):
+        swift_loc = commands.getoutput("which swift")
+        swift_home = swift_loc.split("bin")[0]
+        sites_file = swift_home+"etc/sites.xml"
+        print "no sites file specified, setting to default: "+sites_file
+
+try:
+    parsefile(sites_file)
+    print "%s is well-formed" % sites_file
+except Exception, e:
+    print "Error: there is a problem with your sites file"
+    print "%s is %s" % (sites_file, e)
+    sys.exit()
                                                            
-        p = xml.parsers.expat.ParserCreate()
-        p.StartElementHandler = start_element
-        p.EndElementHandler = end_element
-        p.ParseFile(open(filename,"r"))
+p = xml.parsers.expat.ParserCreate()
+p.StartElementHandler = start_element
+p.EndElementHandler = end_element
+p.ParseFile(open(sites_file,"r"))
 
 config = 0
 pool = 0