1 new changeset in galaxy-central: http://bitbucket.org/galaxy/galaxy-central/changeset/fa7693b1064b/ changeset: fa7693b1064b user: dan date: 2011-10-06 20:22:59 summary: Some genomespace_file_browser tweaks. affected #: 2 files (-1 bytes) --- a/lib/galaxy/tools/__init__.py Thu Oct 06 13:55:25 2011 -0400 +++ b/lib/galaxy/tools/__init__.py Thu Oct 06 14:22:59 2011 -0400 @@ -2028,6 +2028,7 @@ data_dict = dict( out_data_name = out_name, ext = data.ext, dataset_id = data.dataset.id, + hda_id = data.id, file_name = file_name, extra_files_path = extra_files_path ) --- a/tools/data_source/genomespace_file_browser.py Thu Oct 06 13:55:25 2011 -0400 +++ b/tools/data_source/genomespace_file_browser.py Thu Oct 06 14:22:59 2011 -0400 @@ -109,8 +109,8 @@ assert None not in [ username, token ], "Missing GenomeSpace username or token." output_filename = datasource_params.get( "output", None ) dataset_id = json_params['output_data'][0]['dataset_id'] + hda_id = json_params['output_data'][0]['hda_id'] url_opener = get_cookie_opener( username, token ) - file_count = 1 file_url_prefix = "fileUrl" file_type_prefix = "fileFormat" metadata_parameter_file = open( json_params['job_config']['TOOL_PROVIDED_JOB_METADATA_FILE'], 'wb' ) @@ -120,19 +120,16 @@ name = name[len( file_url_prefix ):] file_numbers.append( int( name ) ) file_numbers.sort() - print 'file_numbers', file_numbers - #print 'datasource_params', datasource_params for file_num in file_numbers: url_key = "%s%i" % ( file_url_prefix, file_num ) download_url = datasource_params.get( url_key, None ) if download_url is None: - print 'wtf none', file_num break filetype_key = "%s%i" % ( file_type_prefix, file_num ) filetype_url = datasource_params.get( filetype_key, None ) galaxy_ext = get_galaxy_ext_from_genomespace_format_url( url_opener, filetype_url ) if output_filename is None: - output_filename = os.path.join( datasource_params['__new_file_path__'], 'primary_%i_output%i_visible_%s' % ( dataset_id, file_count, galaxy_ext ) ) + output_filename = os.path.join( datasource_params['__new_file_path__'], 'primary_%i_output%i_visible_%s' % ( hda_id, file_num, galaxy_ext ) ) else: if dataset_id is not None: metadata_parameter_file.write( "%s\n" % simplejson.dumps( dict( type = 'dataset', 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.