diff --git a/flaskfdx/tools/fdxsql.py b/flaskfdx/tools/fdxsql.py index df70e38..41bca62 100644 --- a/flaskfdx/tools/fdxsql.py +++ b/flaskfdx/tools/fdxsql.py @@ -105,22 +105,15 @@ def getDate(srcSheet): reportDate = tempDate[6:10]+'-'+tempDate[0:2]+'-'+tempDate[3:5] return reportDate -def main(): - # get filename and database rom cmdline - parser = argparse.ArgumentParser() - parser.add_argument("type") - parser.add_argument("inFile") - parser.add_argument("database") - args = parser.parse_args() - +def processDsw(file, database): # open the excel sheet for reading - srcBook = xlrd.open_workbook(args.inFile) + srcBook = xlrd.open_workbook(file) srcSheet = srcBook.sheet_by_index(0) reportDate = getDate(srcSheet) #open the database - conn = openDatabase(args.database) + conn = openDatabase(database) if conn == None: sys.exit('database could not be opened, does it exist') @@ -130,5 +123,19 @@ def main(): else: extractDsw(srcSheet, conn, reportDate) + +def main(): + # get filename and database rom cmdline + parser = argparse.ArgumentParser() + parser.add_argument("type") + parser.add_argument("inFile") + parser.add_argument("database") + args = parser.parse_args() + + if args.type == 'dsw': + processDsw(args.inFile, args.database) + else: + print('type not found or not entered') + if __name__ == '__main__': main()