opensource/galaxy
3
0
Fork 0
mirror of https://github.com/galaxyproject/galaxy.git synced 2026-09-24 16:30:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix for GenomeSpace Export root directory listing.

Browse Source
This commit is contained in:
Daniel Blankenberg
2013-06-20 16:24:33 -04:00
parent 61b8656e68
commit e25140647f
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tools/genomespace/genomespace_exporter.py
+4 -3
View File
@@ -70,7 +70,7 @@ def get_directory( url_opener, dm_url, path ):
return ( dir_dict, path )
def get_default_directory( url_opener, dm_url ):
return get_directory( url_opener, dm_url, ["defaultdirectory"] )[0]
return get_directory( url_opener, dm_url, ["%s/defaultdirectory" % ( GENOMESPACE_API_VERSION_STRING ) ] )[0]
def get_personal_directory( url_opener, dm_url ):
return get_directory( url_opener, dm_url, [ "%s/personaldirectory" % ( GENOMESPACE_API_VERSION_STRING ) ] )[0]
@@ -143,8 +143,9 @@ def galaxy_code_get_genomespace_folders( genomespace_site='prod', trans=None, va
url_opener = get_cookie_opener( username, token )
genomespace_site_dict = get_genomespace_site_urls()[ genomespace_site ]
dm_url = genomespace_site_dict['dmServer']
#get default directory
directory_dict = get_default_directory( url_opener, dm_url ).get( 'directory', None )
#get export root directory
#directory_dict = get_default_directory( url_opener, dm_url ).get( 'directory', None ) #This directory contains shares and other items outside of the users home
directory_dict = get_personal_directory( url_opener, dm_url ).get( 'directory', None ) #Limit export list to only user's home dir
if directory_dict is None:
return []
#what directory to stuff this in
tools/genomespace/genomespace_exporter.xml
+1 -1
View File
@@ -1,5 +1,5 @@
<?xml version="1.0"?>
<tool name="GenomeSpace Exporter" id="genomespace_exporter" require_login="True" version="0.0.1">
<tool name="GenomeSpace Exporter" id="genomespace_exporter" require_login="True" version="0.0.2">
<description> - send data to GenomeSpace</description>
<command interpreter="python">genomespace_exporter.py
--genomespace_site "prod"