lables is now a method, not an attribute

This commit is contained in:
Martin Diehl 2016-05-18 18:31:54 +02:00
parent be99018ce3
commit aa9a8b21c7
2 changed files with 3 additions and 3 deletions

View File

@ -59,7 +59,7 @@ for name in filenames:
for label in datainfo['label']: for label in datainfo['label']:
key = label key = label
if key in table.labels: if key in table.labels(raw = True):
active.append(label) active.append(label)
column[label] = table.labels.index(key) # remember columns of requested data column[label] = table.labels.index(key) # remember columns of requested data
else: else:

View File

@ -89,14 +89,14 @@ for name in filenames:
# ------------------------------------------ assemble header -------------------------------------- # ------------------------------------------ assemble header --------------------------------------
table.info_append(scriptID + '\t' + ' '.join(sys.argv[1:])) table.info_append(scriptID + '\t' + ' '.join(sys.argv[1:]))
table.labels_append(mappedTable.labels) # extend ASCII header with new labels table.labels_append(mappedTable.labels(raw = True)) # extend ASCII header with new labels
table.head_write() table.head_write()
# ------------------------------------------ process data ------------------------------------------ # ------------------------------------------ process data ------------------------------------------
outputAlive = True outputAlive = True
while outputAlive and table.data_read(): # read next data line of ASCII table while outputAlive and table.data_read(): # read next data line of ASCII table
table.data_append(mappedTable.data[int(round(float(table.data[mappedColumn])))+options.offset-1]) # add all mapped data types table.data_append(mappedTable.data[int(round(float(table.data[mappedColumn])))+options.offset-1]) # add all mapped data types
outputAlive = table.data_write() # output processed line outputAlive = table.data_write() # output processed line
# ------------------------------------------ output finalization ----------------------------------- # ------------------------------------------ output finalization -----------------------------------