a2e61e016375032eb6250cf4d931979100808b80
galt
Tue Aug 5 12:45:32 2014 -0700
Adding more flexibility so that if genomeSpace is not configured in hg.conf (or set to blank values), then it will be ignored, and GS will not appear in hgTables pages: mainPage, usage, etc.
diff --git src/hg/hgTables/usage.c src/hg/hgTables/usage.c
index 9161c34..a00e625 100644
--- src/hg/hgTables/usage.c
+++ src/hg/hgTables/usage.c
@@ -1,29 +1,44 @@
/* usage - functions that display helpful usage info text go here. -jk)*/
/* Copyright (C) 2013 The Regents of the University of California
* See README in this or parent directory for licensing information. */
#include "common.h"
#include "jksql.h"
#include "hgTables.h"
+static char *getGenomeSpaceText()
+/* Return GenomeSpace help text if it is enabled */
+{
+if (isGenomeSpaceEnabled())
+ {
+ return
+"
Send output to GenomeSpace: sends data to \n"
+" GenomeSpace Data Manager for use with\n"
+" diverse computational tools.\n";
+ }
+else
+ {
+ return "";
+ }
+}
void printMainHelp()
/* Put up main page help info. */
{
-hPrintf("%s",
+hPrintf(
"This section provides brief line-by-line descriptions of the Table \n"
"Browser controls. For more information on using this program, see the \n"
"Table \n"
"Browser User's Guide.\n"
" \n"
" - clade: Specifies which clade the organism is in.
\n"
" \n"
" - genome: Specifies which organism data to use.
\n"
" \n"
" - assembly: Specifies which version of the organism's genome\n"
" sequence to use.
\n"
" \n"
" - group: Selects the type of tracks to be displayed in \n"
" the track list. The options correspond to the track groupings\n"
" shown in the Genome Browser. Select 'All Tracks' for an alphabetical list\n"
@@ -115,35 +130,35 @@
" \n"
"
- data points - the data points that make up a graph \n"
" (aka wiggle) track.
\n"
" \n"
" - MAF - multiple alignments in MAF format
\n"
" \n"
"
\n"
" \n"
" \n"
" Send output to Galaxy: displays results of query in \n"
" Galaxy, a framework for \n"
" interactive genome analysis.\n"
" Send output to GREAT: displays the functional enrichments of the \n"
" query results in GREAT, a tool for\n"
" analysis of the biological function of cis-regulatory regions.\n"
-" Send output to GenomeSpace: sends data to \n"
-" GenomeSpace Data Manager for use with\n"
-" diverse computational tools.\n"
+"%s"
" file type returned: When a filename is entered in the \n"
" "output file" text box, specifies the format of the output file:\n"
" \n"
" - plain text - data is in ASCII format\n"
" \n"
"
- gzip compressed - data is compressed in gzip format\n"
" \n"
"
\n"
" \n"
" get output: Submits a data query based on the specified \n"
" parameters and returns the output.\n"
" \n"
" summary/statistics: Displays statistics about the data \n"
" specified by the parameters.\n"
" \n"
-" \n");
+" \n"
+, getGenomeSpaceText()
+);
}