diff --git a/src/hg/hgTrackUi/hgTrackUi.c b/src/hg/hgTrackUi/hgTrackUi.c index 389b0cc..2c66c3c 100644 --- a/src/hg/hgTrackUi/hgTrackUi.c +++ b/src/hg/hgTrackUi/hgTrackUi.c @@ -2345,7 +2345,7 @@ else if (tdb->type != NULL) wordCount = chopLine(typeLine, words); if (wordCount > 0) { - if (sameWord(words[0], "genePred")) + if (sameWord(words[0], "genePred")) { genePredCfgUi(cart,tdb,tdb->track,NULL,FALSE); } @@ -2394,6 +2394,14 @@ else if (tdb->type != NULL) baseColorDrawOptDropDown(cart, tdb); indelShowOptions(cart, tdb); } + else if (sameWord(words[0], "factorSource")) + { + printf("
Cell Abbreviations:
\n"); + char *sourceTable = trackDbRequiredSetting(tdb, "sourceTable"); + struct sqlConnection *conn = hAllocConn(database); + hPrintAbbreviationTable(conn, sourceTable, "Cell Type"); + hFreeConn(&conn); + } } freeMem(typeLine); } diff --git a/src/hg/hgc/peakClusters.c b/src/hg/hgc/peakClusters.c index 5102a73..616baa3 100644 --- a/src/hg/hgc/peakClusters.c +++ b/src/hg/hgc/peakClusters.c @@ -324,26 +324,12 @@ if (cluster != NULL) } webPrintLinkTableEnd(); - webNewSection("Track Description"); - - /* Print out table of abbreviations. */ + webNewSection("Table of abbreviations for cells"); char *sourceTable = trackDbRequiredSetting(tdb, "sourceTable"); - printf("Table of abbreviations for cells
\n"); - safef(query, sizeof(query), "select name,description from %s order by name", sourceTable); - struct sqlResult *sr = sqlGetResult(conn, query); - webPrintLinkTableStart(); - webPrintLabelCell("Symbol"); - webPrintLabelCell("Cell Type"); - while ((row = sqlNextRow(sr)) != NULL) - { - printf("\n"); - char *name = row[0]; - char *description = row[1]; - webPrintLinkCell(name); - webPrintLinkCell(description); - } - sqlFreeResult(&sr); - webPrintLinkTableEnd(); + hPrintAbbreviationTable(conn, sourceTable, "Cell Type"); + + + webNewSection("Track Description"); } } diff --git a/src/hg/inc/hui.h b/src/hg/inc/hui.h index 2cceb02..cb41ec8 100644 --- a/src/hg/inc/hui.h +++ b/src/hg/inc/hui.h @@ -1131,4 +1131,7 @@ void extraUiLinks(char *db,struct trackDb *tdb); boolean chainDbNormScoreAvailable(struct trackDb *tdb); /* check if normScore column is specified in trackDb as available */ +void hPrintAbbreviationTable(struct sqlConnection *conn, char *sourceTable, char *label); +/* Print out table of abbreviations. */ + #endif /* HUI_H */ diff --git a/src/hg/lib/hui.c b/src/hg/lib/hui.c index ab74a11..7c449a3 100644 --- a/src/hg/lib/hui.c +++ b/src/hg/lib/hui.c @@ -23,6 +23,7 @@ #include "customTrack.h" #include "encode/encodePeak.h" #include "mdb.h" +#include "web.h" static char const rcsid[] = "$Id: hui.c,v 1.297 2010/06/02 19:27:51 tdreszer Exp $"; @@ -6583,3 +6584,25 @@ if (differentWord(normScoreTest, "no")) return normScoreAvailable; } +void hPrintAbbreviationTable(struct sqlConnection *conn, char *sourceTable, char *label) +/* Print out table of abbreviations. */ +{ +char query[256]; +safef(query, sizeof(query), "select name,description from %s order by name", sourceTable); +struct sqlResult *sr = sqlGetResult(conn, query); +webPrintLinkTableStart(); +webPrintLabelCell("Symbol"); +webPrintLabelCell(label); +char **row; +while ((row = sqlNextRow(sr)) != NULL) + { + printf("\n"); + char *name = row[0]; + char *description = row[1]; + webPrintLinkCell(name); + webPrintLinkCell(description); + } +sqlFreeResult(&sr); +webPrintLinkTableEnd(); +} +