1 new commit in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/changeset/63a8fb1d8e2b/ changeset: 63a8fb1d8e2b user: jgoecks date: 2012-09-21 20:05:37 summary: Small additions based on bdd35af2a18a affected #: 2 files diff -r bdd35af2a18afde11396fcf919b5fb4cacc986ff -r 63a8fb1d8e2b8a8da71a5b618ef65981ff5c4ac3 lib/galaxy/visualization/data_providers/registry.py --- a/lib/galaxy/visualization/data_providers/registry.py +++ b/lib/galaxy/visualization/data_providers/registry.py @@ -30,7 +30,8 @@ def get_data_provider( self, trans, name=None, source='data', raw=False, original_dataset=None ): """ - Returns data provider class by name and/or original dataset. + Returns data provider matching parameter values. For standalone data + sources, source parameter is ignored. """ data_provider = None diff -r bdd35af2a18afde11396fcf919b5fb4cacc986ff -r 63a8fb1d8e2b8a8da71a5b618ef65981ff5c4ac3 lib/galaxy/web/controllers/visualization.py --- a/lib/galaxy/web/controllers/visualization.py +++ b/lib/galaxy/web/controllers/visualization.py @@ -756,15 +756,9 @@ # Get dataset and indexed datatype. dataset = self.get_hda_or_ldda( trans, track[ 'hda_ldda'], track[ 'dataset_id' ] ) data_sources = dataset.get_datasources( trans ) - data_provider_registry = trans.app.data_provider_registry - if 'data_standalone' in data_sources: - indexed_type = data_sources['data_standalone']['name'] - data_provider = data_provider_registry.get_data_provider( indexed_type )( dataset ) - else: - indexed_type = data_sources['index']['name'] - # Get converted dataset and append track's genome data. - converted_dataset = dataset.get_converted_dataset( trans, indexed_type ) - data_provider = data_provider_registry.get_data_provider( indexed_type )( converted_dataset, dataset ) + data_provider = trans.app.data_provider_registry.get_data_provider( trans, + original_dataset=dataset, + source='index' ) # HACK: pass in additional params, which are only used for summary tree data, not BBI data. track[ 'genome_wide_data' ] = { 'data': data_provider.get_genome_data( chroms_info, level=4, detail_cutoff=0, draw_cutoff=0 ) } 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.