opensource/galaxy
3
0
Fork 0
mirror of https://github.com/galaxyproject/galaxy.git synced 2026-10-28 02:58:18 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix for Async datasources where URL is different from the original tool action and where URL already contains query parameters.

Browse Source
This commit is contained in:
Daniel Blankenberg
2015-07-04 16:00:28 +01:00
parent 4d184f5a17
commit a649cefbad
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/galaxy/webapps/galaxy/controllers/async.py
+8 -1
View File
@@ -121,7 +121,14 @@ class ASync( BaseUIController ):
galaxy_url = trans.request.base + '/async/%s/%s/%s' % ( tool_id, data.id, key )
params.update( { 'GALAXY_URL' :galaxy_url } )
params.update( { 'data_id' :data.id } )
url = tool.action + '?' + urllib.urlencode( params.flatten() )
# Use provided URL or fallback to tool action
url = URL or tool.action
# Does url already have query params?
if '?' in url:
url_join_char = '&'
else:
url_join_char = '?'
url = "%s%s%s" % ( url, url_join_char, urllib.urlencode( params.flatten() ) )
log.debug("connecting to -> %s" % url)
trans.log_event( "Async connecting to -> %s" % url )
text = urllib.urlopen(url).read(-1)