602d10062159c2b22161feb7dc1b8054bbd8c517
larrym
Wed Aug 10 13:45:19 2011 -0700
put measureTiming stuff in spans
diff --git src/hg/hgTracks/mainMain.c src/hg/hgTracks/mainMain.c
index f8ecb65..db0af56 100644
--- src/hg/hgTracks/mainMain.c
+++ src/hg/hgTracks/mainMain.c
@@ -28,30 +28,31 @@
* Because the browser is a central program, most of it's cart
* variables are not hgt. qualified. It's a good idea if other
* program's unique variables be qualified with a prefix though. */
char *excludeVars[] = { "submit", "Submit", "hgt.reset",
"hgt.in1", "hgt.in2", "hgt.in3", "hgt.inBase",
"hgt.out1", "hgt.out2", "hgt.out3",
"hgt.left1", "hgt.left2", "hgt.left3",
"hgt.right1", "hgt.right2", "hgt.right3",
"hgt.dinkLL", "hgt.dinkLR", "hgt.dinkRL", "hgt.dinkRR",
"hgt.tui", "hgt.hideAll", "hgt.visAllFromCt",
"hgt.psOutput", "hideControls", "hgt.toggleRevCmplDisp",
"hgt.collapseGroups", "hgt.expandGroups", "hgt.suggest",
"hgt.jump", "hgt.refresh", "hgt.setWidth",
"hgt.trackImgOnly", "hgt.ideogramToo", "hgt.trackNameFilter", "hgt.imageV1", "hgt.suggestTrack", "hgt.setWidth",
TRACK_SEARCH, TRACK_SEARCH_ADD_ROW, TRACK_SEARCH_DEL_ROW, TRACK_SEARCH_PAGER,
+ "hgt.contentType",
NULL };
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
@@ -59,20 +60,20 @@
* somehow can't be moved effectively into doMiddle. */
htmlPushEarlyHandlers();
cgiSpoof(&argc, argv);
htmlSetBackground(hBackgroundImage());
char * link = webTimeStampedLinkToResourceOnFirstCall("HGStyle.css",TRUE); // resource file link wrapped in html
if (link)
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)
{
- fprintf(stdout, "Overall total time: %ld millis
\n",
+ fprintf(stdout, "Overall total time: %ld millis
\n",
clock1000() - enteredMainTime);
}
return 0;
}