slightly more sensible variable name

Author: bkatiemills

build-db.py

@@ -164,7 +164,7 @@ def builddb(infile, check_originator_flag_type = True,
 
         query = "INSERT INTO " + dbtable + " (raw, truth, uid, year, month, day, time, lat, long, country, cruise, ocruise, probe, flagged) values (?,?,?,?,?,?,?,?,?,?,?,?,?,?);"
         values = (p['raw'], p['truth'], p['uid'], p['year'], p['month'], p['day'], p['time'], p['latitude'], p['longitude'], country, p['cruise'], orig_cruise, p['probe_type'], int(flagged))
-        main.dbinteract(query, values, inputdb=outfile)
+        main.dbinteract(query, values, targetdb=outfile)
         if profile.is_last_profile_in_file(fid) == True:
             break
 

plot-roc.py

@@ -78,13 +78,13 @@ def plotRow(row):
     pylab.savefig(dir + str(p.uid()) + '.png', bbox_inches='tight')
     plt.close()
 
-def plot_roc(inputdb='iquod.db'):
+def plot_roc(targetdb='iquod.db'):
 
     # get qc tests
     testNames = main.importQC('qctests')
 
     # connect to database
-    conn = sqlite3.connect(inputdb, isolation_level=None)
+    conn = sqlite3.connect(targetdb, isolation_level=None)
     cur = conn.cursor()
 
     # extract matrix of test results and true flags into a dataframe

util/dbutils.py

@@ -84,10 +84,10 @@ def db_to_df(table,
              filter_on_wire_break_test=False, 
              filter_on_tests={},
              n_to_extract=numpy.iinfo(numpy.int32).max,
-             inputdb='iquod.db'):
+             targetdb='iquod.db'):
 
     '''
-    Reads the table from inputdb into a pandas dataframe.
+    Reads the table from targetdb into a pandas dataframe.
     If filter_on_wire_break_test is True, the results from that test are used to exclude
          levels below a wire break from the test results and the wire break test is not returned.
     filter_on_tests is a generalised form of filter_on_wire_break and is used to exclude results; it takes a list of
@@ -100,7 +100,7 @@ def db_to_df(table,
     testNames.sort()
 
     # connect to database
-    conn = sqlite3.connect(inputdb, isolation_level=None)
+    conn = sqlite3.connect(targetdb, isolation_level=None)
     cur = conn.cursor()
 
     # extract matrix of test results and true flags into a dataframe

util/main.py

@@ -167,15 +167,15 @@ def dictify(rows, keys):
 
   return dicts
 
-def dbinteract(command, values=[], tries=0, inputdb='iquod.db'):
+def dbinteract(command, values=[], tries=0, targetdb='iquod.db'):
   '''
   execute the given SQL command;
   catch errors and retry a maximum number of times;
   '''
 
   max_retry = 100
 
-  conn = sqlite3.connect(inputdb, isolation_level=None, timeout=60)
+  conn = sqlite3.connect(targetdb, isolation_level=None, timeout=60)
   cur = conn.cursor()
 
   try:
@@ -201,13 +201,13 @@ def dbinteract(command, values=[], tries=0, inputdb='iquod.db'):
       print('database interaction failed after', max_retry, 'retries')
       return -1  
 
-def interact_many(query, values, tries=0, inputdb='iquod.db'):
+def interact_many(query, values, tries=0, targetdb='iquod.db'):
   # similar to dbinteract, but does executemany
   # intended exclusively for writes
 
   max_retry = 100
 
-  conn = sqlite3.connect(inputdb, isolation_level=None, timeout=60)
+  conn = sqlite3.connect(targetdb, isolation_level=None, timeout=60)
   cur = conn.cursor()
 
   try: