# Mark Huang <mlhuang@cs.princeton.edu>
# Copyright (C) 2005 The Trustees of Princeton University
#
-# $Id: Shell.py,v 1.10 2006/11/02 15:05:07 mlhuang Exp $
+# $Id: Shell.py,v 1.12 2006/11/02 22:07:22 mlhuang Exp $
#
import os, sys
user = None
password = None
role = None
+xmlrpc = False
-if len(sys.argv) > 1 and os.path.exists(sys.argv[1]):
+if len(sys.argv) < 2 or not os.path.exists(sys.argv[1]):
# Parse options if called interactively
- script = sys.argv[1]
-
def usage():
print "Usage: %s [OPTION]..." % sys.argv[0]
print "Options:"
password = optval
elif opt == "-r" or opt == "--role":
role = optval
+ elif opt == "-x" or opt == "--xmlrpc":
+ xmlrpc = True
elif opt == "--help":
usage()
-else:
- # Do not parse options if called by a script
- opts = None
try:
# If any XML-RPC options have been specified, do not try
# connecting directly to the DB.
- if opts:
+ if (url, method, user, password, role, xmlrpc) != \
+ (None, None, None, None, None, False):
raise Exception
# Otherwise, first try connecting directly to the DB. If this