84161997c78fb7f23f9fdb62e8cafd850db6dc88 tdreszer Mon Nov 22 14:47:56 2010 -0800 Removed a lot of ifdefs whose time had come. Renamed one function for clarity. diff --git src/hg/hgTrackUi/hgTrackUi.c src/hg/hgTrackUi/hgTrackUi.c index b090d02..828ff0c 100644 --- src/hg/hgTrackUi/hgTrackUi.c +++ src/hg/hgTrackUi/hgTrackUi.c @@ -2470,31 +2470,31 @@ puts(tdbParent->html); } else printf("<h2>No description found for: %s.</h2>",tdbParent?tdbParent->track:tdb->track); } cartRemove(cart,"descriptionOnly"); // This is a once only request and should be deleted return; } if(tdbIsContainer(tdb)) { safef(setting,sizeof(setting),"%s.%s",tdb->track,RESET_TO_DEFAULTS); // NOTE: if you want track vis to not be reset, move to after vis dropdown if (1 == cartUsualInt(cart, setting, 0)) cartRemoveAllForTdbAndChildren(cart,tdb); else if (!ajax) // Overkill on !ajax, because ajax shouldn't be called for a composite - cartTdbTreeMatchSubtrackVis(cart,tdb); + cartTdbTreeReshapeIfNeeded(cart,tdb); } printf("<FORM ACTION=\"%s\" NAME=\""MAIN_FORM"\" METHOD=%s>\n\n", hgTracksName(), cartUsualString(cart, "formMethod", "POST")); cartSaveSession(cart); printf("<B style='font-family:serif; font-size:200%%;'>%s%s</B>\n", tdb->longLabel, tdbIsSuper(tdb) ? " Tracks" : ""); /* Print link for parent track */ struct trackDb *parentTdb = tdb->parent; if (parentTdb && !ajax) { char *encodedMapName = cgiEncode(parentTdb->track); printf(" <B style='font-family:serif; font-size:100%%;'>(<A HREF=\"%s?%s=%u&c=%s&g=%s\" title='Link to parent track'><IMG height=12 src='../images/ab_up.gif'>%s</A>)</B>", hgTrackUiName(), cartSessionVarName(), cartSessionId(cart), chromosome, encodedMapName, parentTdb->shortLabel);