68cf4a2ecd4af858df71423ca9e48394ce95b194 tdreszer Wed Nov 24 09:55:37 2010 -0800 Fixed redmine 1071.30. Two tracks in findtracks results with same table were tripping each others '...' metadata links. Link should be based on track name, not table name. diff --git src/hg/lib/hui.c src/hg/lib/hui.c index b97ee39..ea38a54 100644 --- src/hg/lib/hui.c +++ src/hg/lib/hui.c @@ -231,38 +231,38 @@ } dyStringAppend(dyTable,""); //mdbObjsFree(&mdbObj); // spill some memory return dyStringCannibalize(&dyTable); } boolean compositeMetadataToggle(char *db,struct trackDb *tdb,char *title, boolean embeddedInText,boolean showLongLabel, struct hash *trackHash) /* If metadata from metaTbl exists, create a link that will allow toggling it's display */ { const struct mdbObj *safeObj = metadataForTable(db,tdb,NULL); if(safeObj == NULL || safeObj->vars == NULL) return FALSE; printf("%s%s", - (embeddedInText?" ":"

"),tdb->table,tdb->table, showLongLabel?"true":"false", title); + (embeddedInText?" ":"

"),tdb->track,tdb->track, showLongLabel?"true":"false", title); if (!sameString(tdb->table, tdb->track) && trackHash != NULL) // If trackHash is needed, then can't fill this in with ajax { - printf("

",tdb->table, + printf("",tdb->track, metadataAsHtmlTable(db,tdb,showLongLabel,TRUE,trackHash) ); } else - printf("",tdb->table); + printf("",tdb->track); return TRUE; } void extraUiLinks(char *db,struct trackDb *tdb, struct hash *trackHash) /* Show downlaods, schema and metadata links where appropriate */ { boolean schemaLink = (isCustomTrack(tdb->table) == FALSE) && (hTableOrSplitExists(db, tdb->table)); boolean metadataLink = (!tdbIsComposite(tdb) && metadataForTable(db, tdb, NULL) != NULL); boolean downloadLink = (trackDbSetting(tdb, "wgEncode") != NULL && !tdbIsSuperTrack(tdb)); boolean moreThanOne = (schemaLink && metadataLink) || (schemaLink && downloadLink) || (downloadLink && metadataLink);