details: http://www.bx.psu.edu/hg/galaxy/rev/075c0fd5b1d5 changeset: 2455:075c0fd5b1d5 user: Greg Von Kuster greg@bx.psu.edu date: Thu Jun 18 12:10:36 2009 -0400 description: Fix for detecting metadata column types in tabular files, the number of lines read for detecting column types will always be the max setting, with previously detected column types being overridden if appropriate ( e.g., int overridden with float ). This will only occur in files whose data varies between types within the same column.

1 file(s) affected in this change:

lib/galaxy/datatypes/tabular.py

diffs (14 lines):

diff -r d83b9225b5dd -r 075c0fd5b1d5 lib/galaxy/datatypes/tabular.py --- a/lib/galaxy/datatypes/tabular.py Tue Jun 16 13:54:33 2009 -0400 +++ b/lib/galaxy/datatypes/tabular.py Thu Jun 18 12:10:36 2009 -0400 @@ -121,8 +121,8 @@ #"column_types": ["int", "int", "str", "list"] first_line_column_types = column_types column_types = [ None for col in first_line_column_types ] - elif ( column_types and None not in column_types ) or i > num_check_lines: - #found and set all known columns, or we exceeded our max check lines + elif i > num_check_lines: + # We exceeded our max check lines break

#we error on the larger number of columns