From b7e5183ba3a39e71bbb583e08048ac18c21915fe Mon Sep 17 00:00:00 2001 From: Daniel Blankenberg Date: Wed, 11 Feb 2015 12:37:59 -0500 Subject: [PATCH] Fix for TabularToolDataTable.get_named_fields_list() when a data line has extra columns. --- lib/galaxy/tools/data/__init__.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/lib/galaxy/tools/data/__init__.py b/lib/galaxy/tools/data/__init__.py index 2f648ac0b0c..ecff997dbfd 100644 --- a/lib/galaxy/tools/data/__init__.py +++ b/lib/galaxy/tools/data/__init__.py @@ -335,11 +335,13 @@ class TabularToolDataTable( ToolDataTable, Dictifiable ): def get_named_fields_list( self ): rval = [] - named_colums = self.get_column_name_list() + named_columns = self.get_column_name_list() for fields in self.get_fields(): field_dict = {} for i, field in enumerate( fields ): - field_name = named_colums[i] + if i == len( named_columns ): + break + field_name = named_columns[i] if field_name is None: field_name = i #check that this is supposed to be 0 based. field_dict[ field_name ] = field