Small additions based on bdd35af2a18a

This commit is contained in:
Jeremy Goecks
2012-09-21 14:05:37 -04:00
parent 6fefb40d4b
commit 2e310f6cc6
2 changed files with 5 additions and 10 deletions
@@ -30,7 +30,8 @@ class DataProviderRegistry( object ):
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
+3 -9
View File
@@ -756,15 +756,9 @@ class VisualizationController( BaseUIController, SharableMixin, UsesAnnotations,
# 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 ) }