Mercurial > repos > cathywise > truststore_browse_testing
changeset 10:16b0ceecf1f7
* Open in new window/tab * Apparently URL has to be capitalised (why... who knows, there's no docs).
| author | Catherine Wise <catherine.wise@csiro.au> |
|---|---|
| date | Wed, 13 May 2015 08:47:13 +1000 |
| parents | 0f2a5664c9eb |
| children | 406690068ab6 |
| files | TrustStoreGalaxyBrowse.py TrustStoreGalaxyBrowse.xml |
| diffstat | 2 files changed, 8 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/TrustStoreGalaxyBrowse.py Tue May 12 11:35:04 2015 +1000 +++ b/TrustStoreGalaxyBrowse.py Wed May 13 08:47:13 2015 +1000 @@ -110,7 +110,7 @@ extra_files_path, file_name, ext, out_data_name, hda_id, dataset_id = \ operator.itemgetter('extra_files_path', 'file_name', 'ext', 'out_data_name', 'hda_id', 'dataset_id')(output_data[0]) - url_params = json_params['url'].split(";") + url_params = json_params['URL'].split(";") if len(url_params) < 3: print("The url we got back is malformed: "+ url_params) sys.exit(5)
--- a/TrustStoreGalaxyBrowse.xml Tue May 12 11:35:04 2015 +1000 +++ b/TrustStoreGalaxyBrowse.xml Wed May 13 08:47:13 2015 +1000 @@ -1,5 +1,6 @@ -<tool id="ts_import_2" name="Browse Data from TrustStore" tool_type="data_source" version="0.5" force_history_refresh="True"> <!-- tool_type="data_source"> --> - <description> secure cloud storage.</description> +<?xml version="1.0"?> +<tool id="ts_import_2" name="Browse Data from TrustStore" tool_type="data_source" version="0.5.1" force_history_refresh="True"> + <description>secure cloud storage.</description> <stdio> <exit_code range="2" err_level="fatal" description="Could not find store with given ID, or don't have access rights." /> <exit_code range="3" err_level="fatal" description="Could not find path in store." /> @@ -7,10 +8,12 @@ <exit_code range="5" err_level="fatal" description="Bad credentials supplied. See stdout for more information." /> </stdio> <command interpreter="python">TrustStoreGalaxyImport.py $output "."</command> - <inputs action="https://tstest-kms.it.csiro.au/kmscolab_3_0/login" check_values="false" method="get" target="_top"> - <display>go to TrustStore server $GALAXY_URL $tool_id</display> + <inputs action="https://tstest-kms.it.csiro.au/kmscolab_3_0/login" check_values="false" method="get" target="_blank"> + <display>go to TrustStore server $GALAXY_URL</display> <!--<param name="appCallbackUrl" type="baseurl" value="/tool_runner?tool_id=ts_import_2" />--> <param name="GALAXY_URL" type="baseurl" value="/tool_runner?tool_id=testtoolshed.g2.bx.psu.edu%2Frepos%2Fcathywise%2Ftruststore_browse_testing%2Fts_import_2%2F0.5" /> + <!-- <param name="GALAXY_URL" type="baseurl" value="/tool_runner" /> + <param name="tool_id" type="hidden" value="ts_import_2" /> --> </inputs> <request_param_translation> <request_param galaxy_name="url" remote_name="url" missing="" />