split parameter writing for CSV and SQL into separate functions

1 files changed, 7 insertions, 2 deletions

diff --git a/pySim-prog.py b/pySim-prog.py
index b0b65ef..622b00e 100755
--- a/pySim-prog.py
+++ b/pySim-prog.py
@@ -378,8 +378,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']
@@ -388,6 +388,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
@@ -418,6 +419,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']