42e8d342702477b7143c07ce85e470fbe95f9468 galt Mon Aug 11 10:28:03 2014 -0700 oops. We tolerate missing genomeSpace settings now -- that will simply make GS features disappear. diff --git src/hg/hgTables/genomeSpace.c src/hg/hgTables/genomeSpace.c index ea3f202..9e6a047 100644 --- src/hg/hgTables/genomeSpace.c +++ src/hg/hgTables/genomeSpace.c @@ -111,32 +111,30 @@ char *headerEnd = strstr(dy->string, headerEndString); if (!headerEnd) errAbort("header end not found in response"); char *gsResponse = cloneString(headerEnd+strlen(headerEndString)); dyStringFree(&dy); return gsResponse; } static char *getGenomeSpaceConfig(char *variable) /* Read genomeSpace config setting or abort if not found */ { char *value = cfgOption2("genomeSpace", variable); -if (!value) - errAbort("missing genomeSpace setting genomeSpace.%s in hg.conf", variable); return value; } boolean isGenomeSpaceEnabled() /* genomeSpace is enabled by the presence of GS config settings. */ { char *iSU = getGenomeSpaceConfig("identityServerUrl"); char *dmSvr = getGenomeSpaceConfig("dmServer"); if (isNotEmpty(iSU) && isNotEmpty(dmSvr)) return TRUE; return FALSE; } char *insertUserPasswordIntoUrl(char *url, char *user, char *password) /* Insert cgi-encoded user and password into url after protocol. Free returned string when done. */