826a14eeb65fa9a877c362ded4de9d311f991a61
chmalee
Thu Sep 17 16:25:15 2020 -0700
Fix relatedTracks section breaking on trackHubs that was lost when merging development branch, refs #26203
diff --git src/hg/lib/hui.c src/hg/lib/hui.c
index a217e98..8a6c445 100644
--- src/hg/lib/hui.c
+++ src/hg/lib/hui.c
@@ -9595,31 +9595,31 @@
struct trackVersion *trackVersion = getTrackVersion(database, tdb->track);
// try trackVersion table with parent, for composites/superTracks
if (trackVersion == NULL && tdb->parent != NULL)
trackVersion = getTrackVersion(database, tdb->parent->track);
if (trackVersion != NULL)
version = trackVersion->version;
}
if (isNotEmpty(version))
printf("Data version: %s
\n", version);
}
void printRelatedTracks(char *database, struct hash *trackHash, struct trackDb *tdb, struct cart *cart)
/* Maybe print a "related track" section */
{
-if (!cfgOption("db.relatedTrack"))
+if (!cfgOption("db.relatedTrack") || trackHubDatabase(database))
return;
char *relatedTrackTable = cfgOptionDefault("db.relatedTrack","relatedTrack");
struct sqlConnection *conn = hAllocConn(database);
if (!sqlTableExists(conn, relatedTrackTable))
{
hFreeConn(&conn);
return;
}
char query[256];
sqlSafef(query, sizeof(query),
"select track1, track2, why from %s where track1='%s' or track2='%s'", relatedTrackTable, tdb->track, tdb->track);
char **row;
struct sqlResult *sr;