Mercurial > repos > melissacline > ucsc_xena_platform

changeset 29:fc6f93710384

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fixing a merge issue
author melissacline
date Mon, 13 Jul 2015 14:35:34 -0700
parents 782e91e9ef48 (diff) e1a4d4552ec0 (current diff)
children 77f5d8cbac77
files ucsc_xena_datapages.xml ucsc_xena_hub.xml ucsc_xenabrowser.xml xena.jar xena_utils.pyc
diffstat 3 files changed, 4 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/ucsc_xena_datapages.xml	Mon Jul 13 14:17:54 2015 -0700
+++ b/ucsc_xena_datapages.xml	Mon Jul 13 14:35:34 2015 -0700
@@ -3,6 +3,7 @@
     If the value of 'URL_method' is 'get', the request will consist of the value of 'URL' coming back in
     the initial response.  If value of 'URL_method' is 'post', any additional params coming back in the
     initial response ( in addition to 'URL' ) will be encoded and appended to URL and a post will be performed.
+   July 13, 2015
 -->
 <tool name="Explore Data in Xena" id="ucsc_xenadatapages" tool_type="data_source">
     <description>Browse the UCSC Xena Data Pages.</description>
--- a/ucsc_xena_hub.xml	Mon Jul 13 14:17:54 2015 -0700
+++ b/ucsc_xena_hub.xml	Mon Jul 13 14:35:34 2015 -0700
@@ -3,6 +3,7 @@
     If the value of 'URL_method' is 'get', the request will consist of the value of 'URL' coming back in
     the initial response.  If value of 'URL_method' is 'post', any additional params coming back in the
     initial response ( in addition to 'URL' ) will be encoded and appended to URL and a post will be performed.
+   July 13, 2015
 -->
 <tool name="Xena Data Hub" id="ucsc_xenadatahub" tool_type="data_source">
     <description>Select your Xena Data Hub</description>
--- a/ucsc_xenabrowser.xml	Mon Jul 13 14:17:54 2015 -0700
+++ b/ucsc_xenabrowser.xml	Mon Jul 13 14:35:34 2015 -0700
@@ -3,11 +3,12 @@
     If the value of 'URL_method' is 'get', the request will consist of the value of 'URL' coming back in
     the initial response.  If value of 'URL_method' is 'post', any additional params coming back in the
     initial response ( in addition to 'URL' ) will be encoded and appended to URL and a post will be performed.
+   July 13, 2015
 -->
 <tool name="UCSC Xena Browser" id="ucsc_xenabrowser" tool_type="data_source">
     <description>Run the UCSC Xena Browser as a Galaxy tool.</description>
     <command interpreter="python">ucsc_xena_download.py $genomic $clinical $__app__.config.output_size_limit</command>   
-    <inputs action="https://genome-cancer.ucsc.edu/proj/site/xena/heatmap/" check_values="false" method="get">
+    <inputs action="https://genome-cancer.soe.ucsc.edu/proj/site/xena/heatmap/" check_values="false" method="get">
          <display>go to UCSC Xena Browser $GALAXY_URL</display>
         <param name="GALAXY_URL" type="baseurl" value="/tool_runner" />
         <param name="tool_id" type="hidden" value="ucsc_xenabrowser" />