88caf854ecaff6e75f3bb936d961dc6895c5d402
chinhli
Wed Jan 9 12:56:56 2013 -0800
redmine 9269: Change track exonJunctionPrimers to of type bedDetail 14 to minimize impact to hgc.c based on Hiram's feedback from CR #9927
diff --git src/hg/hgc/hgc.c src/hg/hgc/hgc.c
index e912309..45e7e14 100644
--- src/hg/hgc/hgc.c
+++ src/hg/hgc/hgc.c
@@ -23873,55 +23873,41 @@
else
{
table = ct->dbTableName;
conn = hAllocConn(CUSTOM_TRASH);
bedPart = ct->fieldCount - 2;
/* header handled by custom track handler */
}
/* postion, band, genomic size */
escName = sqlEscapeString(itemName);
safef(query, sizeof(query),
"select * from %s where chrom = '%s' and chromStart = %d and chromEnd = %d and name = '%s'", table, chrom, start, end, escName);
sr = sqlGetResult(conn, query);
if ((row = sqlNextRow(sr)) != NULL)
{
- if (sameString("exonJunctionPrimers", table))
- {
- char *url;
- url = tdb->url;
- r = bedDetailLoadWithGaps(row, bedPart+4);
- bedPrintPos((struct bed*)r, bedPart, tdb);
- if ((r->id != NULL) && (r->description != NULL) && (url != NULL))
- {
- printf("%s: ", r->description);
- printf("%s
",url, r->id, r->id);
- }
- }
- else
- {
r = bedDetailLoadWithGaps(row, bedPart+2);
bedPrintPos((struct bed*)r, bedPart, tdb);
if (r->id != NULL)
{
+ if (!sameString("exonJunctionPrimers", table))
printf("ID: %s
\n", r->id);
printCustomUrl(tdb, r->id, TRUE);
}
- if (r->description != NULL)
+ if ((r->description != NULL) && (!sameString("exonJunctionPrimers", table)))
printf("%s
\n", r->description);
}
- }
sqlFreeResult(&sr);
/* do not print this for custom tracks, they do this later */
if (ct == NULL)
printTrackHtml(tdb);
bedDetailFree(&r);
freeMem(escName);
hFreeConn(&conn);
}
struct trackDb *tdbForTableArg()
/* get trackDb for track passed in table arg */
{
char *table = cartString(cart, "table");
struct trackDb *tdb = hashFindVal(trackHash, table);