a1707797e434bd59ef53ef18510c62eb8cb100cb larrym Fri Mar 23 13:32:01 2012 -0700 commit tim's code to stop using trackHash in compositeMetadataToggle; this fixes #7376 diff --git src/hg/hgTrackUi/hgTrackUi.c src/hg/hgTrackUi/hgTrackUi.c index 6c949c6..9b853de 100644 --- src/hg/hgTrackUi/hgTrackUi.c +++ src/hg/hgTrackUi/hgTrackUi.c @@ -2640,35 +2640,35 @@ expRatioUi(tdb); else if (startsWith("chromGraph", tdb->type)) chromGraphUi(tdb); else if (startsWith("sample", tdb->type)) genericWiggleUi(tdb,7); else if (startsWithWord("array",tdb->type)) /* not quite the same as an "expRatio" type (custom tracks) */ expRatioCtUi(tdb); else if (startsWithWord("factorSource",tdb->type)) factorSourceUi(database,tdb); } if (!ajax) // ajax asks for a simple cfg dialog for right-click popup or hgTrackUi subtrack cfg { // Composites *might* have had their top level controls just printed, but almost certainly have additional controls if (tdbIsComposite(tdb)) // for the moment generalizing this to include other containers... - hCompositeUi(database, cart, tdb, NULL, NULL, MAIN_FORM, trackHash); + hCompositeUi(database, cart, tdb, NULL, NULL, MAIN_FORM); // Additional special case navigation links may be added previewLinks(database, tdb); - extraUiLinks(database,tdb, trackHash); + extraUiLinks(database,tdb); } } #ifdef UNUSED static void findSuperChildrenAndSettings(struct trackDb *tdbList, struct trackDb *super) /* Find the tracks that have super as a parent and stuff references to them on * super's children list. Also do some visibility and parentName futzing. */ { struct trackDb *tdb; for (tdb = tdbList; tdb != NULL; tdb = tdb->next) { if (tdb->parent == super) { trackDbSuperMemberSettings(tdb); /* This adds tdb to tdb->parent->children. */ } @@ -2871,31 +2871,31 @@ 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;'>"); if (trackDbSetting(tdb, "wgEncode")) { if (!hIsPreviewHost()) { // TODO: get from hui.c printf("<A TARGET=_BLANK HREF='http://%s/cgi-bin/hgTrackUi?db=%s&g=%s' TITLE='Early access to unreviewed new data on the Preview Browser...'>Preview</A>", "genome-preview.ucsc.edu", database, tdb->track); } printf(" "); - makeDownloadsLink(database, tdb, trackHash); + makeDownloadsLink(database, tdb); } char *downArrow = "⇓"; enum browserType browser = cgiBrowser(); if (browser == btIE || browser == btFF) downArrow = "↓"; printf(" <A HREF='#DISPLAY_SUBTRACKS' TITLE='Jump to subtracks section of page'>Subtracks%s</A>",downArrow); printf(" <A HREF='#TRACK_HTML' TITLE='Jump to description section of page'>Description%s</A>",downArrow); printf(" </span>"); } } if (!tdbIsSuperTrack(tdb) && !tdbIsComposite(tdb)) puts("<BR>"); if (tdbIsDownloadsOnly(tdb)) filesDownloadUi(database,cart,tdb); // Composites without tracks but with files to download are tdb->type: downloadsOnly