1 new commit in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/commits/261471d04763/ Changeset: 261471d04763 User: dannon Date: 2014-08-25 15:28:26 Summary: Merged in kellrott/galaxy-farm/upload_uuid (pull request #463) Enabling UUID in file upload Affected #: 3 files diff -r 9d8b9171a945341e36aae88572d4d37dd9b12ef2 -r 261471d0476328d8bbdbe71b9d6a954abf032ad7 lib/galaxy/tools/actions/upload_common.py --- a/lib/galaxy/tools/actions/upload_common.py +++ b/lib/galaxy/tools/actions/upload_common.py @@ -243,6 +243,7 @@ else: data.extension = uploaded_dataset.file_type data.dbkey = uploaded_dataset.dbkey + data.uuid = uploaded_dataset.uuid trans.sa_session.add( data ) trans.sa_session.flush() if library_bunch: diff -r 9d8b9171a945341e36aae88572d4d37dd9b12ef2 -r 261471d0476328d8bbdbe71b9d6a954abf032ad7 lib/galaxy/tools/parameters/grouping.py --- a/lib/galaxy/tools/parameters/grouping.py +++ b/lib/galaxy/tools/parameters/grouping.py @@ -278,6 +278,7 @@ ftp_files = context['ftp_files'] name = context.get( 'NAME', None ) info = context.get( 'INFO', None ) + uuid = context.get( 'uuid', None ) warnings = [] to_posix_lines = False if context.get( 'to_posix_lines', None ) not in [ "None", None, False ]: @@ -316,12 +317,14 @@ break file_bunch.to_posix_lines = to_posix_lines file_bunch.space_to_tab = space_to_tab + file_bunch.uuid = uuid return file_bunch, warnings def get_filenames( context ): rval = [] data_file = context['file_data'] url_paste = context['url_paste'] ftp_files = context['ftp_files'] + uuid = context.get( 'uuid', None ) name = context.get( 'NAME', None ) info = context.get( 'INFO', None ) to_posix_lines = False @@ -332,12 +335,14 @@ space_to_tab = True warnings = [] file_bunch = get_data_file_filename( data_file, override_name = name, override_info = info ) + file_bunch.uuid = uuid if file_bunch.path: file_bunch.to_posix_lines = to_posix_lines file_bunch.space_to_tab = space_to_tab rval.append( file_bunch ) for file_bunch in get_url_paste_urls_or_filename( context, override_name = name, override_info = info ): if file_bunch.path: + file_bunch.uuid = uuid file_bunch.to_posix_lines = to_posix_lines file_bunch.space_to_tab = space_to_tab rval.append( file_bunch ) diff -r 9d8b9171a945341e36aae88572d4d37dd9b12ef2 -r 261471d0476328d8bbdbe71b9d6a954abf032ad7 tools/data_source/upload.xml --- a/tools/data_source/upload.xml +++ b/tools/data_source/upload.xml @@ -41,6 +41,7 @@ <!-- Swap the following parameter for the select one that follows to enable the to_posix_lines option in the Web GUI. See Bitbucket Pull Request 171 for more information. --> + <param name="uuid" type="hidden" required="False" /><param name="to_posix_lines" type="hidden" value="Yes" /><!-- <param name="to_posix_lines" type="select" display="checkboxes" multiple="True" label="Convert universal line endings to Posix line endings" help="Turn this option off if you upload a gzip, bz2 or zip archive which contains a binary file." value="Yes"> 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.