[galaxy-commits] galaxy-dist commit 7242f2dffed3: Fixed another bug in column join so it will handle filling empty columns properly
# HG changeset patch -- Bitbucket.org
# Project galaxy-dist
# URL http://bitbucket.org/galaxy/galaxy-dist/overview
# User Kelly Vincent <kpvincent(a)bx.psu.edu>
# Date 1282338256 14400
# Node ID 7242f2dffed302ad6d0d727e43ede1ed65c39463
# Parent 8a3d3fba037061a818b4417978542ae7b71f2e1a
Fixed another bug in column join so it will handle filling empty columns properly
--- a/tools/new_operations/column_join.py
+++ b/tools/new_operations/column_join.py
@@ -241,10 +241,14 @@ def __main__():
new_split_line = split_line[:]
split_line = []
for i, item in enumerate( new_split_line ):
- if item:
+ col = i + 1
+ if not item:
+ try:
+ split_line.append( fill_empty[ i + 1 ] )
+ except KeyError:
+ split_line.append( item )
+ else:
split_line.append( item )
- else:
- split_line.append( fill_empty[ i + 1 ] )
# add actual data to be output below
if ''.join( split_line ):
for col in cols:
@@ -265,9 +269,11 @@ def __main__():
fout.write( '%s%s' % ( delimiter, delimiter.join( current_data )
) )
elif current_data:
fout.write( '%s%s%s' % ( current, delimiter, delimiter.join(
current_data ) ) )
+ last_lines = ''.join( current_lines )
+ else:
+ last_lines = None
last_loc = loc
old_current = current
- last_lines = ''.join( current_lines )
first_line = False
# fill trailing empty columns for final line
if last_loc < len( inputs ) - 1: