changeset 18:2c58e3cc1b30 draft

Uploaded 20170601
author fabio
date Thu, 01 Jun 2017 17:45:01 -0400
parents 1224f3d9b5c7
children 5244d3a1a441
files ._gdcwebapp.xml ._json_data_source_mod.py gdcwebapp.xml json_data_source_mod.py
diffstat 4 files changed, 2 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
Binary file ._gdcwebapp.xml has changed
Binary file ._json_data_source_mod.py has changed
--- a/gdcwebapp.xml	Thu Jun 01 13:07:25 2017 -0400
+++ b/gdcwebapp.xml	Thu Jun 01 17:45:01 2017 -0400
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<tool name="GDCWebApp" id="data_source_gdcwebapp" tool_type="data_source" hidden="False" display_interface="False" version="1.0.0" force_history_refresh="True">
+<tool name="GDCWebApp" id="data_source_gdcwebapp" tool_type="data_source_async" hidden="False" display_interface="False" version="1.0.0" force_history_refresh="True">
     <description>an intuitive interface to filter, extract, and convert Genomic Data Commons experiments</description>
     <requirements>
         <requirement type="package" version="2.7.10">python</requirement>
@@ -16,7 +16,6 @@
     </command>
     <inputs check_values="False" action="http://bioinf.iasi.cnr.it/gdcwebapp/app.php" >
         <display>Go to GDCWebApp service $GALAXY_URL</display>
-        <param name="URL" type="hidden" value="" />
     </inputs>
     <outputs>
         <data name="output1" format="auto" label="${tool.name} Output Data" hidden="True" />
--- a/json_data_source_mod.py	Thu Jun 01 13:07:25 2017 -0400
+++ b/json_data_source_mod.py	Thu Jun 01 17:45:01 2017 -0400
@@ -116,7 +116,7 @@
                 extension = splitext( filename )[1]
                 # pattern: (?P<identifier_0>[^_]+)_(?P<identifier_1>[^_]+)_(?P<ext>[^_]+)_(?P<dbkey>[^_]+)
                 if (len(extension) > 0):
-                    filename = (filename[0:len(filename)-(len(extension)+1)]).replace(".", "-") + "_" + extension
+                    filename = (filename[0:len(filename)-(len(extension)+1)]).replace(".", "-") + "." + extension + "_" + extension
                 else:
                     extension = "auto"
                 filename_with_collection_prefix = archive_name + "_" + filename + "_" + db_key