# HG changeset patch
# User Catherine Wise <catherine.wise@csiro.au>
# Date 1432247288 -36000
# Node ID 624d8102cb75349f6847a53251101c159ad3a638
# Parent  eb08580b547a2fdd858b207b40c39d0bc928fd7c
Fix json output again.

diff -r eb08580b547a -r 624d8102cb75 TrustStoreGalaxyBrowse.py
--- a/TrustStoreGalaxyBrowse.py	Thu May 21 14:20:56 2015 +1000
+++ b/TrustStoreGalaxyBrowse.py	Fri May 22 08:28:08 2015 +1000
@@ -173,16 +173,16 @@
                     print("Downloading file..." + ", ".join([loc.name for loc in locations]))
                 for location in locations:
                     filename = "".join(c in SAFE_CHARS and c or '-' for c in location.name)
-                    extension = os.path.splitext(filename)[1]
+                    extension = os.path.splitext(filename)[1].strip(".")
                     name = construct_multi_filename(hda_id, filename, extension)
                     target_output_filename = None
-                    data_type = "dataset"
+                    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("/".join([extra_files_path, name]))
+                        target_output_filename = os.path.normpath(os.path.join(extra_files_path, name))
                     metadata_file.write(
                         metadata_to_json(dataset_id, target_output_filename, name, extension, data_type))
                     download = truststore.getFile(store, location)