[hg] galaxy 1553: Fix for data_source tool params sent in the po...

classic Classic list List threaded Threaded
1 message Options
| Threaded
Open this post in threaded view
|

[hg] galaxy 1553: Fix for data_source tool params sent in the po...

Nate Coraor (nate@bx.psu.edu)
details:   http://www.bx.psu.edu/hg/galaxy/rev/248627e7bd58
changeset: 1553:248627e7bd58
user:      Greg Von Kuster <[hidden email]>
date:      Mon Oct 13 14:55:13 2008 -0400
description:
Fix for data_source tool params sent in the post from the remote data source.

1 file(s) affected in this change:

lib/galaxy/tools/__init__.py

diffs (33 lines):

diff -r 4b9feffc3ce5 -r 248627e7bd58 lib/galaxy/tools/__init__.py
--- a/lib/galaxy/tools/__init__.py Thu Oct 09 11:23:33 2008 -0400
+++ b/lib/galaxy/tools/__init__.py Mon Oct 13 14:55:13 2008 -0400
@@ -1134,10 +1134,11 @@
         if self.tool_type == 'data_source':
             # List for converting UCSC to Galaxy exts, if not in following dictionary, use provided datatype
             data_type_to_ext = { 'wigdata':'wig', 'tab':'interval', 'hyperlinks':'html', 'sequence':'fasta' }
-            dbkey = param_dict.get( 'dbkey ' )
+            dbkey = param_dict.get( 'dbkey' )
             organism = param_dict.get( 'organism' )
             table = param_dict.get( 'table' )
             description = param_dict.get( 'description' )
+            info = param_dict.get( 'info' )
             if description == 'range':
                 description = param_dict.get( 'position', '' )
                 if not description:
@@ -1147,6 +1148,7 @@
             for name, data in items:
                 if organism and table and description:
                     data.name  = '%s on %s: %s (%s)' % ( data.name, organism, table, description )
+                data.info = info
                 data.dbkey = dbkey
                 ext = data_type
                 try:
@@ -1169,7 +1171,7 @@
         # tag set in the tool config.
         if self.tool_type == 'data_source':
             name, data = out_data.items()[0]
-            if data.state == data.states.OK:
+            if data.state == data.states.OK and not data.info:
                 data.info = data.name
             if not isinstance( data.datatype, datatypes.interval.Bed ) and isinstance( data.datatype, datatypes.interval.Interval ):
                 data.set_meta()