From 97e69fbbdfd820b3044ef3289484850bf3faa566 Mon Sep 17 00:00:00 2001 From: Dannon Baker Date: Fri, 17 Aug 2012 13:55:37 -0400 Subject: [PATCH] Fix chunk-serving logic for tabular files. --- lib/galaxy/datatypes/tabular.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/lib/galaxy/datatypes/tabular.py b/lib/galaxy/datatypes/tabular.py index ce3b043b658..0939edae159 100644 --- a/lib/galaxy/datatypes/tabular.py +++ b/lib/galaxy/datatypes/tabular.py @@ -264,10 +264,10 @@ class Tabular( data.Text ): def display_data(self, trans, dataset, preview=False, filename=None, to_ext=None, chunk=None): #TODO Prevent failure when displaying extremely long > 50kb lines. - if to_ext or not preview: - return self._serve_raw(trans, dataset, to_ext) if chunk: return self.get_chunk(trans, dataset, chunk) + if to_ext or not preview: + return self._serve_raw(trans, dataset, to_ext) else: column_names = 'null' if dataset.metadata.column_names: @@ -644,4 +644,5 @@ class FeatureLocationIndex( Tabular ): """ file_ext='fli' MetadataElement( name="columns", default=2, desc="Number of columns", readonly=True, visible=False ) - MetadataElement( name="column_types", default=['str', 'str'], param=metadata.ColumnTypesParameter, desc="Column types", readonly=True, visible=False, no_value=[] ) \ No newline at end of file + MetadataElement( name="column_types", default=['str', 'str'], param=metadata.ColumnTypesParameter, desc="Column types", readonly=True, visible=False, no_value=[] ) +