commit/galaxy-central: dan: Some fixes for trackster/visual analytics.
1 new changeset in galaxy-central: http://bitbucket.org/galaxy/galaxy-central/changeset/90c81fa6114f/ changeset: 90c81fa6114f user: dan date: 2011-06-09 21:58:25 summary: Some fixes for trackster/visual analytics. affected #: 1 file (157 bytes) --- a/lib/galaxy/web/controllers/tracks.py Thu Jun 09 12:06:07 2011 -0400 +++ b/lib/galaxy/web/controllers/tracks.py Thu Jun 09 15:58:25 2011 -0400 @@ -412,6 +412,7 @@ return msg # Return data. + data = None if isinstance( dataset.datatype, Gff ): data = GFFDataProvider( original_dataset=dataset ).get_data( chrom, low, high, **kwargs ) data[ 'dataset_type' ] = 'interval_index' @@ -768,7 +769,9 @@ # for jida in original_job.input_datasets: input_dataset = jida.dataset - if run_on_region and hasattr( input_dataset.datatype, 'get_track_type' ): + if input_dataset is None: #optional dataset and dataset wasn't selected + tool_params[ jida.name ] = None + elif run_on_region and hasattr( input_dataset.datatype, 'get_track_type' ): # Dataset is indexed and hence a subset can be extracted and used # as input. track_type, data_sources = input_dataset.datatype.get_track_type() @@ -802,7 +805,7 @@ trans.sa_session.flush() # Add dataset to tool's parameters. - tool_params[ jida.name ] = new_dataset + tool_params[ jida.name ] = new_dataset.id # # Execute tool and handle outputs. Repository URL: https://bitbucket.org/galaxy/galaxy-central/ -- This is a commit notification from bitbucket.org. You are receiving this because you have the service enabled, addressing the recipient of this email.
participants (1)
-
Bitbucket