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/hgTrackUi/hgTrackUi.c src/hg/hgTrackUi/hgTrackUi.c index fb77ce3..661c558 100644 --- src/hg/hgTrackUi/hgTrackUi.c +++ src/hg/hgTrackUi/hgTrackUi.c @@ -2568,56 +2568,56 @@ printf("</TD></TR>\n"); } printf("<TR><TD NOWRAP>"); if (!tdbIsDownloadsOnly(tdb)) { enum trackVisibility tv = hTvFromString(cartUsualString(cart, tdb->track,hStringFromTv(tdb->visibility))); // Don't use cheapCgi code... no name and no boolshad... just js printf("<INPUT TYPE=CHECKBOX id='%s' onchange='superT.childChecked(this);'%s>", tdb->track,(tv != tvHide?" CHECKED":"")); hTvDropDownClassVisOnlyAndExtra(tdb->track, tv, tdb->canPack, (tv == tvHide ? "hiddenText":"normalText"), trackDbSetting(tdb, "onlyVisibility"), "onchange='superT.selChanged(this);'"); printf("</TD>\n<TD>"); - printf("<A HREF='%s?%s=%u&c=%s&g=%s' onclick='return superT.submitAndLink(this);'>" + printf("<A HREF='%s?%s=%s&c=%s&g=%s' onclick='return superT.submitAndLink(this);'>" "%s</A> ", (tdbIsDownloadsOnly(tdb)? hgFileUiName(): hgTrackUiName()), cartSessionVarName(), cartSessionId(cart), chromosome, cgiEncode(tdb->track), tdb->shortLabel); } else { - printf("<A HREF='%s?%s=%u&g=%s'>Downloads</A>", + printf("<A HREF='%s?%s=%s&g=%s'>Downloads</A>", hgFileUiName(),cartSessionVarName(), cartSessionId(cart), cgiEncode(tdb->track)); printf("</TD>\n<TD>"); printf("%s ",tdb->shortLabel); } printf("</TD>\n"); #else///ifndef SUPERS_WITH_CHECKBOXES printf("<TR><TD NOWRAP>"); if (tdbIsDownloadsOnly(tdb)) printf("%s ",tdb->shortLabel); else - printf("<A HREF='%s?%s=%u&c=%s&g=%s'>%s</A> ", + printf("<A HREF='%s?%s=%s&c=%s&g=%s'>%s</A> ", (tdbIsDownloadsOnly(tdb)? hgFileUiName(): hgTrackUiName()), cartSessionVarName(), cartSessionId(cart), chromosome, cgiEncode(tdb->track), tdb->shortLabel); printf("</TD><TD>"); if (tdbIsDownloadsOnly(tdb)) { - printf("<A HREF='%s?%s=%u&g=%s'>Downloads</A>", + printf("<A HREF='%s?%s=%s&g=%s'>Downloads</A>", hgFileUiName(),cartSessionVarName(), cartSessionId(cart), cgiEncode(tdb->track)); } else { enum trackVisibility tv = hTvFromString(cartUsualString(cart, tdb->track, hStringFromTv(tdb->visibility))); hTvDropDownClassVisOnly(tdb->track, tv, tdb->canPack, tv == tvHide ? "hiddenText" : "normalText", trackDbSetting(tdb, "onlyVisibility")); } #endif///ndef SUPERS_WITH_CHECKBOXES printf("<TD>%s", tdb->longLabel); char *dataVersion = trackDbSetting(tdb, "dataVersion"); if (dataVersion) printf("  <EM style='color:#666666; font-size:smaller;'>%s</EM>", dataVersion); @@ -2938,45 +2938,45 @@ else { if (trackDbSetting(tdb, "wgEncode")) printf("<A HREF='/ENCODE/index.html'><IMG style='vertical-align:middle;' " "width=100 src='/images/ENCODE_scaleup_logo.png'><A>"); printf("<B style='font-size:200%%;'>%s%s</B>\n", tdb->longLabel, tdbIsSuper(tdb) ? " Tracks" : ""); } /* Print link for parent track */ if (!ajax) { if (tdb->parent) { char *encodedMapName = cgiEncode(tdb->parent->track); printf(" <B style='font-size:100%%;'>" - "(<A HREF=\"%s?%s=%u&c=%s&g=%s\" title='Link to parent track'>" + "(<A HREF=\"%s?%s=%s&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, tdb->parent->shortLabel); freeMem(encodedMapName); } else { struct grp *grp, *grps = hLoadGrps(database); for (grp = grps; grp != NULL; grp = grp->next) { if (sameString(grp->name,tdb->grp)) { printf(" <B style='font-size:100%%;'>" - "(<A HREF=\"%s?%s=%u&c=%s&hgTracksConfigPage=configure" + "(<A HREF=\"%s?%s=%s&c=%s&hgTracksConfigPage=configure" "&hgtgroup_%s_close=0#%sGroup\" title='%s tracks in track configuration " "page'><IMG height=12 src='../images/ab_up.gif'>All %s%s</A>)</B>", hgTracksName(), cartSessionVarName(), cartSessionId(cart),chromosome, tdb->grp,tdb->grp,grp->label,grp->label, endsWith(grp->label," Tracks")?"":" tracks"); break; } } grpFreeList(&grps); } } puts("<BR><BR>"); if (ct && sameString(tdb->type, "maf")) tdb->canPack = TRUE; @@ -3042,31 +3042,31 @@ "return false;'>Reset to defaults</a>\n",setting); } if (ct) { puts(" "); cgiMakeButton(CT_DO_REMOVE_VAR, "Remove custom track"); cgiMakeHiddenVar(CT_SELECTED_TABLE_VAR, tdb->track); puts(" "); if (differentString(tdb->type, "chromGraph")) { char buf[256]; if (ajax) // reference to a separate form doesn't work in modal dialog, // so change window.location directly. - safef(buf, sizeof(buf), "window.location='%s?hgsid=%d&%s=%s';return false;", + safef(buf, sizeof(buf), "window.location='%s?hgsid=%s&%s=%s';return false;", hgCustomName(), cartSessionId(cart), CT_SELECTED_TABLE_VAR, tdb->track); else safef(buf, sizeof(buf), "document.customTrackForm.submit();return false;"); cgiMakeOnClickButton(buf, "Update custom track"); } } } if (!tdbIsSuper(tdb) && !tdbIsDownloadsOnly(tdb) && !ajax) { // NAVLINKS - For pages w/ matrix, add Description, Subtracks and Downloads links if (trackDbSetting(tdb, "dimensions") || (trackDbSetting(tdb, "wgEncode") && tdbIsComposite(tdb))) { printf("\n <span id='navDown' style='float:right; display:none;'>");