564752c30f5ec7260f1fcd600ae270a700f97e70 max Tue Apr 14 05:35:35 2015 -0700 Revert "first go a external tools integration" This reverts commit ad9686d48e880c57458d09ac2cc03801dc822be4. diff --git src/hg/hgTracks/mainMain.c src/hg/hgTracks/mainMain.c index fb6c1b8..e983bdc 100644 --- src/hg/hgTracks/mainMain.c +++ src/hg/hgTracks/mainMain.c @@ -1,57 +1,65 @@ /* hgTracks - Human Genome browser main cgi script. */ /* Copyright (C) 2013 The Regents of the University of California * See README in this or parent directory for licensing information. */ #include "common.h" #include "linefile.h" #include "portable.h" #include "memalloc.h" #include "localmem.h" #include "hCommon.h" #include "obscure.h" #include "dystring.h" #include "hash.h" #include "cheapcgi.h" #include "htmshell.h" #include "web.h" #include "cart.h" #include "hdb.h" #include "hui.h" #include "hgFind.h" #include "hgTracks.h" #include "versionInfo.h" #include "net.h" #include "search.h" #include "imageV2.h" int main(int argc, char *argv[]) { long enteredMainTime = clock1000(); measureTime(NULL); setUdcCacheDir(); browserName = hBrowserName(); organization = "UCSC"; +/* change title if this is for GSID */ +browserName = (hIsGsidServer() ? "Sequence View" : browserName); +organization = (hIsGsidServer() ? "GSID" : organization); +organization = (hIsGisaidServer() ? "GISAID" : organization); + /* Push very early error handling - this is just * for the benefit of the cgiVarExists, which * somehow can't be moved effectively into doMiddle. */ htmlPushEarlyHandlers(); cgiSpoof(&argc, argv); char * link = webTimeStampedLinkToResourceOnFirstCall("HGStyle.css",TRUE); // resource file link if (link) // wrapped in html htmlSetStyle(link); oldVars = hashNew(10); +if (hIsGsidServer()) + cartHtmlShell("GSID Sequence View", doMiddle, hUserCookie(), excludeVars, oldVars); +else cartHtmlShell("UCSC Genome Browser v"CGI_VERSION, doMiddle, hUserCookie(), excludeVars, oldVars); if (measureTiming) measureTime("Time to write and close cart"); if (measureTiming) { fprintf(stdout, "Overall total time: %ld millis
\n", clock1000() - enteredMainTime); } cgiExitTime("hgTracks", enteredMainTime); return 0; }