36b68d86eab6cc966eeae336ef56483b9373a0f0 angie Thu Jun 11 09:52:29 2015 -0700 Since Data Integrator is released, add it to globalNavBar.inc and remove the special case hook from web.c. refs #14579 diff --git src/hg/lib/web.c src/hg/lib/web.c index fd686e5..975a2ad 100644 --- src/hg/lib/web.c +++ src/hg/lib/web.c @@ -1306,39 +1306,30 @@ endsWith(scriptName, "hgGene"))) { struct trackDb *tdb = hTrackDbForTrack(db, track); if (tdb) { struct trackDb *topLevel = trackDbTopLevelSelfOrParent(tdb); safef(hgTablesOptions, sizeof hgTablesOptions, "../cgi-bin/hgTables?hgta_doMainPage=1&hgta_group=%s&hgta_track=%s&hgta_table=%s&", topLevel->grp, topLevel->track, tdb->table); menuStr = replaceChars(menuStr, "../cgi-bin/hgTables?", hgTablesOptions); trackDbFree(&tdb); } } } -// Show Data Integrator link if hgIntegrator is present. -if (fileExists("hgIntegrator")) - { - char hgIntegratorItem[1024]; - safef(hgIntegratorItem, sizeof(hgIntegratorItem), - "<li><a href=\"../cgi-bin/hgIntegrator?%s\">Data Integrator</a></li>", uiVars); - menuStr = replaceChars(menuStr, "<!-- DATA_INTEGRATOR -->", hgIntegratorItem); - } - if(!loginSystemEnabled()) stripRegEx(menuStr, "<\\!-- LOGIN_START -->.*<\\!-- LOGIN_END -->", REG_ICASE); if(scriptName) { // Provide optional official mirror servers menu items char *geoMenu = geoMirrorMenu(); char *pattern = "<!-- OPTIONAL_MIRROR_MENU -->"; char *newMenuStr = replaceChars(menuStr, pattern, geoMenu); freez(&menuStr); menuStr = newMenuStr; } if(scriptName) {