706c8c2b49fcbd941c9da43c1b8a950c0c33f5ba
galt
Mon Feb 10 23:54:13 2014 -0800
now converting hgsid and hguid to strings. when the hgsid cart var or hguid cookie is not found it returns NULL instead of 0.
diff --git src/hg/hgTracks/config.c src/hg/hgTracks/config.c
index 2937214..d0726fc 100644
--- src/hg/hgTracks/config.c
+++ src/hg/hgTracks/config.c
@@ -148,31 +148,31 @@
* confusing to the javascript submit() function.
*/
char submitName[256];
safef(submitName, sizeof(submitName), "%sSubmit", group->name);
cgiMakeButtonWithMsg(submitName, "submit","Submit your selections and view them in the browser");
hPrintf("\n");
hPrintf("\n");
/* First non-CT, non-hub group gets ruler. */
if (!showedRuler && !isHubTrack(group->name) &&
differentString(group->name, "user"))
{
showedRuler = TRUE;
hPrintf("
",(isOpen ? "" : "style='display: none'"), group->name);
hPrintf("");
- hPrintf("", hgTrackUiName(),
+ hPrintf("", hgTrackUiName(),
cartSessionVarName(), cartSessionId(cart),
chromName, RULER_TRACK_NAME);
hPrintf("%s", RULER_TRACK_LABEL);
hPrintf(" | ");
hTvDropDownClass("ruler", rulerMode, FALSE, rulerMode ? "normalText" : "hiddenText");
hPrintf(" | ");
hPrintf("Chromosome position in bases. (Clicks here zoom in 3x)");
hPrintf(" |
\n");
}
/* Scan track list to determine which supertracks have visible member
* tracks, and to insert a track in the list for the supertrack.
* Sort tracks and supertracks together by priority */
makeGlobalTrackHash(trackList);
groupTrackListAddSuper(cart, group);
@@ -221,48 +221,48 @@
{
struct track *track = tr->track;
struct trackDb *tdb = track->tdb;
hPrintf("",(isOpen ? "" : "style='display: none;'"),
group->name, rowCount++);
hPrintf("");
if (tdbIsSuperTrackChild(tdb))
/* indent members of a supertrack */
hPrintf(" ");
// Print an icon before the title when one is defined
hPrintPennantIcon(tdb);
if (track->hasUi)
- hPrintf("",
+ hPrintf("",
tdb->parent ? "Part of super track: " : "Configure ",
tdb->parent ? tdb->parent->shortLabel : tdb->shortLabel,
hgTrackUiName(),cartSessionVarName(), cartSessionId(cart), track->track);
hPrintf(" %s", tdb->shortLabel);
if (tdbIsSuper(tdb))
hPrintf("...");
if (track->hasUi)
hPrintf("");
hPrintf(" | ");
if (tdbIsSuperTrackChild(tdb))
/* indent members of a supertrack */
hPrintf(" ");
/* If track is not on this chrom print an informational
message for the user. */
if (tdbIsDownloadsOnly(tdb)) // No vis display for downloadsOnly
- hPrintf("Downloads",
+ hPrintf("Downloads",
hgFileUiName(),cartSessionVarName(), cartSessionId(cart), tdb->track);
else if (hTrackOnChrom(track->tdb, chromName))
{
if (tdbIsSuper(track->tdb))
{
/* supertrack dropdown is hide/show */
superTrackDropDown(cart, track->tdb, 1);
}
else
{
/* check for option of limiting visibility to one mode */
hTvDropDownClassVisOnly(track->track, track->visibility,
rTdbTreeCanPack(track->tdb),
(track->visibility == tvHide) ? "hiddenText" : "normalText",
trackDbSetting(track->tdb, "onlyVisibility"));
|