changeset 17:eefb47f4f438

Try again.
author Wise, Catherine (Digital, Acton) <Catherine.Wise@csiro.au>
date Thu, 25 Jun 2015 12:49:20 +1000
parents bc3e29a97709
children dd8e0066e9f5
files TrustStoreGalaxyBrowse.py
diffstat 1 files changed, 3 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/TrustStoreGalaxyBrowse.py	Thu Jun 25 10:04:23 2015 +1000
+++ b/TrustStoreGalaxyBrowse.py	Thu Jun 25 12:49:20 2015 +1000
@@ -190,16 +190,14 @@
                     name = construct_multi_filename(hda_id, filename, extension)
                     target_output_filename = None
                     data_type = "new_primary_dataset"
-                    # if first:
-                    #     target_output_filename = file_name
-                    #     dataset = "new_primary_dataset"
-                    #     first = False
-                    # else:
                     target_output_filename = os.path.normpath(os.path.join(extra_files_path, name))
                     download = truststore.getFile(store, location)
                     if download is None:
                         print("File %s not found." % location.name)
                         sys.exit(4)
+                    if first:
+                        first = False
+                        target_output_filename = download
                     ungzip(download, target_output_filename)
                     # ext = sniff.handle_uploaded_dataset_file(target_output_filename, datatypes_registry, ext=ext)
                     # print("Guessed file type: " + ext)