028cc4b4e9679a5e38994fa2221cb73e88aa6616 galt Thu Jan 24 19:02:04 2013 -0800 set udc cache location early before cart and doMiddle if possible. Restoring saved sessions with bigDataUrl custom tracks was leaking to /tmp/udcCache instead of correct CGI location under trash. diff --git src/hg/hgTracks/mainMain.c src/hg/hgTracks/mainMain.c index 25b9e0c..ad43e04 100644 --- src/hg/hgTracks/mainMain.c +++ src/hg/hgTracks/mainMain.c @@ -8,50 +8,52 @@ #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 "udc.h" #include "imageV2.h" int main(int argc, char *argv[]) { long enteredMainTime = clock1000(); measureTime(NULL); 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); +setUdcCacheDir(); /* should be set before cart for hgTracks */ 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);