2a4f1d79a36aac4a294c5d332f3b599ebe9be0dc larrym Mon May 14 16:32:21 2012 -0700 fix cruft that was causing an empty "Ensembl" in blue bar for fr2 (pointed out by greg); menuBar => printMenuBar to fix name collision with some new code diff --git src/hg/hgTracks/menu.c src/hg/hgTracks/menu.c index ed3c51a..74d7373 100644 --- src/hg/hgTracks/menu.c +++ src/hg/hgTracks/menu.c @@ -111,40 +111,38 @@ agpFragFree(&agpItem); // if there is a second one agpItem = agpFragLoad(row+1); ++itemCount; if (itemCount > 1) break; } sqlFreeResult(&sr); hFreeConn(&conn); if (1 == itemCount) { // verify *entirely* within single contig if ((winEnd <= agpItem->chromEnd) && (winStart >= agpItem->chromStart)) { int agpStart = winStart - agpItem->chromStart; int agpEnd = agpStart + winEnd - winStart; - hPuts("<TD ALIGN=CENTER>"); printEnsemblAnchor(database, archive, agpItem->frag, agpStart, agpEnd, links); - hPrintf("%s</A></TD>", "Ensembl"); } } agpFragFree(&agpItem); // the one we maybe used } -void menuBar() +void printMenuBar() /* Put up the menu bar. */ { boolean gotBlat = hIsBlatIndexedDatabase(database); struct dyString *uiVars = uiStateUrlPart(NULL); char *orgEnc = cgiEncode(organism); boolean psOutput = cgiVarExists("hgt.psOutput"); struct hotLink *link, *links = NULL; hPrintf("<TABLE WIDTH=\"100%%\" BGCOLOR=\"#000000\" BORDER=\"0\" CELLSPACING=\"0\" CELLPADDING=\"1\"><TR><TD>\n"); hPrintf("<TABLE WIDTH=\"100%%\" BGCOLOR=\"#2636D1\" BORDER=\"0\" CELLSPACING=\"0\" CELLPADDING=\"0\"><TR>\n"); hPrintf("<TD><TABLE BORDER=\"0\"><TR>\n"); hPrintf("<TD ALIGN=CENTER><A HREF=\"../index.html?org=%s&db=%s&%s=%u\" class=\"topbar\">Home</A> </TD>", orgEnc, database, cartSessionVarName(), cartSessionId(cart)); if (hIsGisaidServer())