c7dc2516f4e572dfb4b9bdf7ca9cef4345384f32 max Thu Jul 9 08:01:32 2015 -0700 adding an hg.conf var for galaxy, refs #12642 diff --git src/hg/hgTables/galaxy.c src/hg/hgTables/galaxy.c index 6fe64b6..3d74a83 100644 --- src/hg/hgTables/galaxy.c +++ src/hg/hgTables/galaxy.c @@ -11,42 +11,48 @@ #include "trackDb.h" #include "customTrack.h" #include "hdb.h" #include "web.h" #include "portable.h" #include "hui.h" #include "featureBits.h" #include "hgTables.h" #include "obscure.h" #include "cart.h" #include "grp.h" #include "net.h" #include "htmlPage.h" #include "wiggle.h" #include "trashDir.h" +#include "hgConfig.h" char *getGalaxyUrl() /* Returns the url for the galaxy cgi; default can be overriden by cart var GALAXY_URL. * Don't free result. */ { char *url = NULL; /* use parameter if available */ if (cartVarExists(cart, "GALAXY_URL")) url = cartString(cart, "GALAXY_URL"); else + { + if (cfgOption("galaxyUrl")) + url = cfgOption("galaxyUrl"); + else url = GALAXY_URL_APP; + } return url; } void galaxyHandler (char *format, va_list args) /* error Handler that passes error on to Galaxy */ { char msg[512]; sprintf(msg, format, args); noWarnAbort(); } void sendParamsToGalaxy(char *doParam, char *paramVal) /* intermediate page for formats printed directly from top form */ { char *shortLabel = curTable;