223031012
/
DAMASK_EICMD
mirror of https://github.com/achalhp/DAMASK_EICMD.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fixed whitelist/blacklist behavior (blacking out overrides whitelisting) 

now broken pipes stop script's outputting.
This commit is contained in:
Philip Eisenlohr 2012-02-16 18:47:07 +00:00
parent 58fdf4ebfc
commit ff4c281ed2
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
processing/post/filterTable.py
View File

@ -44,7 +44,7 @@ parser.add_option('-c','--condition', dest='condition', type='string', \
parser.set_defaults(whitelist = []) parser.set_defaults(whitelist = [])
parser.set_defaults(blacklist = []) parser.set_defaults(blacklist = [])
parser.set_defaults(condition = 'True') parser.set_defaults(condition = '')
(options,filenames) = parser.parse_args() (options,filenames) = parser.parse_args()
@ -76,8 +76,8 @@ for file in files:
labels = [] labels = []
positions = [] positions = []
for position,label in enumerate(table.labels): for position,label in enumerate(table.labels):
if (options.whitelist != [] and label in options.whitelist) \ if (options.whitelist == [] or label in options.whitelist) \
or (options.blacklist != [] and label not in options.blacklist): # a label to keep? and (options.blacklist == [] or label not in options.blacklist): # a label to keep?
labels.append(label) # remember name... labels.append(label) # remember name...
positions.append(position) # ...and position positions.append(position) # ...and position
@ -101,19 +101,20 @@ for file in files:
# ------------------------------------------ process data --------------------------------------- # ------------------------------------------ process data ---------------------------------------
while table.data_read(): # read next data line of ASCII table outputAlive = True
while outputAlive and table.data_read(): # read next data line of ASCII table
specials['_row_'] += 1 # count row specials['_row_'] += 1 # count row
if options.condition != '' and eval(eval(evaluator)): # valid row ? if options.condition == '' or eval(eval(evaluator)): # valid row ?
table.data = [table.data[position] for position in positions] # retain filtered columns table.data = [table.data[position] for position in positions] # retain filtered columns
table.data_write() # output processed line outputAlive = table.data_write() # output processed line
# ------------------------------------------ output result --------------------------------------- # ------------------------------------------ output result ---------------------------------------
table.output_flush() # just in case of buffered ASCII table outputAlive and table.output_flush() # just in case of buffered ASCII table
file['input'].close() # close input ASCII table file['input'].close() # close input ASCII table
if file['name'] != 'STDIN': if file['name'] != 'STDIN':
file['output'].close # close output ASCII table file['output'].close() # close output ASCII table
os.rename(file['name']+'_tmp',file['name']) # overwrite old one with tmp new os.rename(file['name']+'_tmp',file['name']) # overwrite old one with tmp new