1f163a84db47d2732e0b2d36d51a86a6308b2c34
tdreszer
Mon Jul 23 11:52:04 2012 -0700
Another round of checkins as dictated by Jim. Required to add a space between 'for' and '('. Can this really be justified?
diff --git src/hg/hgTracks/simpleTracks.c src/hg/hgTracks/simpleTracks.c
index 3b422d3..5f5d4da 100644
--- src/hg/hgTracks/simpleTracks.c
+++ src/hg/hgTracks/simpleTracks.c
@@ -3648,32 +3648,32 @@
int rowOffset, i;
struct linkedFeaturesSeries *lfs;
struct linkedFeatures *lfList = NULL, *lf;
AllocVar(lfs);
lfs->name = cloneString(lfsbed->name);
lfs->start = lfsbed->chromStart;
lfs->end = lfsbed->chromEnd;
lfs->orientation = orientFromChar(lfsbed->strand[0]);
/* Get linked features */
for (i = 0; i < lfsbed->lfCount; i++)
{
AllocVar(lf);
sprintf(rest, "qName = '%s'", lfsbed->lfNames[i]);
- sr = hRangeQuery(conn, lfsbed->pslTable, lfsbed->chrom,
- lfsbed->lfStarts[i], lfsbed->lfStarts[i] + lfsbed->lfSizes[i], rest, &rowOffset);
+ sr = hRangeQuery(conn, lfsbed->pslTable, lfsbed->chrom, lfsbed->lfStarts[i],
+ lfsbed->lfStarts[i] + lfsbed->lfSizes[i], rest, &rowOffset);
if ((row = sqlNextRow(sr)) != NULL)
{
struct psl *psl = pslLoad(row+rowOffset);
lf = lfFromPsl(psl, FALSE);
slAddHead(&lfList, lf);
}
sqlFreeResult(&sr);
}
slReverse(&lfList);
sqlFreeResult(&sr);
hFreeConn(&conn);
lfs->features = lfList;
return lfs;
}
@@ -11562,31 +11562,33 @@
struct sqlConnection *conn = hAllocConn(database);
char *geneLabel = NULL;
char *omimGeneLabel = cartUsualString(cart, "omimGene.label", "OMIM ID");
if (sameWord(omimGeneLabel, "OMIM ID"))
{
geneLabel = el->name;
}
else
{
if (sameWord(omimGeneLabel, "UCSC gene symbol"))
{
/* get the gene symbol of the exact KG that matches not only ID but also genomic position */
safef(query, sizeof(query),
- "select x.geneSymbol from kgXref x, omimToKnownCanonical c, knownGene k, omimGene o where c.omimId='%s' and c.kgId=x.kgId and k.name=x.kgId and o.name=c.omimId and o.chrom=k.chrom and k.txStart=%d and k.txEnd=%d",
+ "select x.geneSymbol from kgXref x, omimToKnownCanonical c, knownGene k, omimGene o"
+ " where c.omimId='%s' and c.kgId=x.kgId and k.name=x.kgId and o.name=c.omimId"
+ " and o.chrom=k.chrom and k.txStart=%d and k.txEnd=%d",
el->name, el->chromStart, el->chromEnd);
geneLabel = sqlQuickString(conn, query);
}
else
{
safef(query, sizeof(query),
"select geneSymbol from omimGeneMap where omimId='%s'", el->name);
geneLabel = sqlQuickString(conn, query);
}
if (geneLabel == NULL)
{
geneLabel = el->name;
}
}