From 1d5968cfcf37b99d34c11521c26d676f6e244c54 Mon Sep 17 00:00:00 2001 From: Harald Welte Date: Mon, 13 Aug 2012 15:53:43 +0200 Subject: split parameter writing for CSV and SQL into separate functions --- pySim-prog.py | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pySim-prog.py b/pySim-prog.py index 46b1842..fa342e4 100755 --- a/pySim-prog.py +++ b/pySim-prog.py @@ -362,8 +362,8 @@ def print_parameters(params): """ % params -def write_parameters(opts, params): - # CSV +def write_params_csv(opts, params): + # csv if opts.write_csv: import csv row = ['name', 'iccid', 'mcc', 'mnc', 'imsi', 'smsp', 'ki', 'opc'] @@ -372,6 +372,7 @@ def write_parameters(opts, params): cw.writerow([params[x] for x in row]) f.close() +def write_params_hlr(opts, params): # SQLite3 OpenBSC HLR if opts.write_hlr: import sqlite3 @@ -402,6 +403,10 @@ def write_parameters(opts, params): conn.commit() conn.close() +def write_parameters(opts, params): + write_params_csv(opts, params) + write_params_hldr(opts, params) + BATCH_STATE = [ 'name', 'country', 'mcc', 'mnc', 'smsp', 'secret', 'num' ] BATCH_INCOMPATIBLE = ['iccid', 'imsi', 'ki'] -- cgit v1.2.1