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/hgc/hgc.c src/hg/hgc/hgc.c
index ffa8d5e..8b8a70b 100644
--- src/hg/hgc/hgc.c
+++ src/hg/hgc/hgc.c
@@ -14023,33 +14023,38 @@
sprintf(query, "SELECT * FROM stsInfoMouseNew WHERE identNo = '%d'", stsRow.identNo);
sr = sqlMustGetResult(conn, query);
row = sqlNextRow(sr);
if (row != NULL)
{
infoRow = stsInfoMouseNewLoad(row);
printf("<TABLE>\n");
printf("<TR><TH ALIGN=left>Chromosome:</TH><TD>%s</TD></TR>\n", seqName);
printf("<TR><TH ALIGN=left>Start:</TH><TD>%d</TD></TR>\n",start+1);
printf("<TR><TH ALIGN=left>End:</TH><TD>%d</TD></TR>\n",end);
printf("</TABLE>\n");
htmlHorizontalLine();
printf("<TABLE>\n");
printf("<TR><TH ALIGN=left>UCSC STS Marker ID:</TH><TD>%d</TD></TR>\n", infoRow->identNo);
if( infoRow->UiStsId != 0)
- printf("<TR><TH ALIGN=left>UniSts Marker ID:</TH><TD><A HREF=\"http://www.ncbi.nlm.nih.gov/genome/sts/sts.cgi?uid=%d\" TARGET=_BLANK>%d</A></TD></TR>\n", infoRow->UiStsId, infoRow->UiStsId);
+ printf("<TR><TH ALIGN=left>UniSts Marker ID:</TH><TD>"
+ "<A HREF=\"http://www.ncbi.nlm.nih.gov/genome/sts/sts.cgi?uid=%d\" "
+ "TARGET=_BLANK>%d</A></TD></TR>\n", infoRow->UiStsId, infoRow->UiStsId);
if( infoRow->MGIId != 0)
- printf("<TR><TH ALIGN=left>MGI Marker ID:</TH><TD><B><A HREF=\"http://www.informatics.jax.org/searches/marker_report.cgi?accID=MGI%c3A%d\" TARGET=_BLANK>%d</A></TD></TR>\n",sChar,infoRow->MGIId,infoRow->MGIId );
+ printf("<TR><TH ALIGN=left>MGI Marker ID:</TH><TD><B>"
+ "<A HREF=\"http://www.informatics.jax.org/searches/marker_report.cgi?"
+ "accID=MGI%c3A%d\" TARGET=_BLANK>%d</A></TD></TR>\n",
+ sChar,infoRow->MGIId,infoRow->MGIId );
if( strcmp(infoRow->MGIName, "") )
printf("<TR><TH ALIGN=left>MGI Marker Name:</TH><TD>%s</TD></TR>\n", infoRow->MGIName);
printf("</TABLE>\n");
htmlHorizontalLine();
/* Print out primer information */
printf("<TABLE>\n");
printf("<TR><TH ALIGN=left>Left Primer:</TH><TD>%s</TD></TR>\n",infoRow->primer1);
printf("<TR><TH ALIGN=left>Right Primer:</TH><TD>%s</TD></TR>\n",infoRow->primer2);
printf("<TR><TH ALIGN=left>Distance:</TH><TD>%s bps</TD></TR>\n",infoRow->distance);
printf("</TABLE>\n");
htmlHorizontalLine();
/* Print out information from genetic maps for this marker */
if(strcmp(infoRow->wigName, "") || strcmp(infoRow->mgiName, "") || strcmp(infoRow->rhName, ""))
printf("<H3>Map Position</H3>\n<TABLE>\n");
if(strcmp(infoRow->wigName, ""))
@@ -14197,33 +14202,37 @@
sprintf(query, "SELECT * FROM stsInfoRat WHERE identNo = '%d'", stsRow.identNo);
sr = sqlMustGetResult(conn, query);
row = sqlNextRow(sr);
if (row != NULL)
{
infoRow = stsInfoRatLoad(row);
printf("<TABLE>\n");
printf("<TR><TH ALIGN=left>Chromosome:</TH><TD>%s</TD></TR>\n", seqName);
printf("<TR><TH ALIGN=left>Start:</TH><TD>%d</TD></TR>\n",start+1);
printf("<TR><TH ALIGN=left>End:</TH><TD>%d</TD></TR>\n",end);
printf("</TABLE>\n");
htmlHorizontalLine();
printf("<TABLE>\n");
printf("<TR><TH ALIGN=left>UCSC STS Marker ID:</TH><TD>%d</TD></TR>\n", infoRow->identNo);
if( infoRow->UiStsId != 0)
- printf("<TR><TH ALIGN=left>UniSts Marker ID:</TH><TD><A HREF=\"http://www.ncbi.nlm.nih.gov/genome/sts/sts.cgi?uid=%d\" TARGET=_BLANK>%d</A></TD></TR>\n", infoRow->UiStsId, infoRow->UiStsId);
+ printf("<TR><TH ALIGN=left>UniSts Marker ID:</TH><TD>"
+ "<A HREF=\"http://www.ncbi.nlm.nih.gov/genome/sts/sts.cgi?uid=%d\" "
+ "TARGET=_BLANK>%d</A></TD></TR>\n", infoRow->UiStsId, infoRow->UiStsId);
if( infoRow->RGDId != 0)
- printf("<TR><TH ALIGN=left>RGD Marker ID:</TH><TD><B><A HREF=\"http://rgd.mcw.edu/tools/query/query.cgi?id=%d\" TARGET=_BLANK>%d</A></TD></TR>\n",infoRow->RGDId,infoRow->RGDId );
+ printf("<TR><TH ALIGN=left>RGD Marker ID:</TH><TD><B>"
+ "<A HREF=\"http://rgd.mcw.edu/tools/query/query.cgi?id=%d\" "
+ "TARGET=_BLANK>%d</A></TD></TR>\n", infoRow->RGDId,infoRow->RGDId );
if( strcmp(infoRow->RGDName, "") )
printf("<TR><TH ALIGN=left>RGD Marker Name:</TH><TD>%s</TD></TR>\n", infoRow->RGDName);
printf("</TABLE>\n");
htmlHorizontalLine();
/* Print out primer information */
printf("<TABLE>\n");
printf("<TR><TH ALIGN=left>Left Primer:</TH><TD>%s</TD></TR>\n",infoRow->primer1);
printf("<TR><TH ALIGN=left>Right Primer:</TH><TD>%s</TD></TR>\n",infoRow->primer2);
printf("<TR><TH ALIGN=left>Distance:</TH><TD>%s bps</TD></TR>\n",infoRow->distance);
printf("</TABLE>\n");
htmlHorizontalLine();
/* Print out information from genetic maps for this marker */
if(strcmp(infoRow->fhhName, "") || strcmp(infoRow->shrspName, "") || strcmp(infoRow->rhName, ""))
printf("<H3>Map Position</H3>\n<TABLE>\n");
if(strcmp(infoRow->fhhName, ""))
@@ -19769,31 +19778,31 @@
*thisEnd += thisPsl->blockSizes[thisPsl->blockCount - 1];
}
boolean sampleClickRelevant( struct sample *smp, int i, int left, int right,
int humMusWinSize, int thisStart, int thisEnd )
/* Decides if a sample is relevant for the current window and psl
* record start and end positions */
{
if ((smp->chromStart + smp->samplePosition[i] - humMusWinSize / 2 + 1) < left
&& (smp->chromStart + smp->samplePosition[i] + humMusWinSize / 2 ) < left )
return(0);
if( smp->chromStart + smp->samplePosition[i] -
humMusWinSize / 2 + 1< thisStart
- && smp->chromStart + smp->samplePosition[i] + humMusWinSize / 2 < thisStart )
+&& (smp->chromStart + smp->samplePosition[i] + humMusWinSize / 2 ) < thisStart )
return(0);
if ((smp->chromStart + smp->samplePosition[i] - humMusWinSize / 2 + 1) > right
&& (smp->chromStart + smp->samplePosition[i] + humMusWinSize / 2 ) > right )
return(0);
if( smp->chromStart + smp->samplePosition[i] -
humMusWinSize / 2 + 1 > thisEnd
&& smp->chromStart + smp->samplePosition[i] +
humMusWinSize / 2 > thisEnd )
return(0);
return(1);
}
@@ -24123,33 +24132,32 @@
"hgc: bad input variables c=%s l=%d r=%d",
cartString(cart, "c"), winStart, winEnd);
else
seqName = hDefaultChrom(database);
}
struct customTrack *ct = NULL;
if (isCustomTrack(track))
{
struct customTrack *ctList = getCtList();
for (ct = ctList; ct != NULL; ct = ct->next)
if (sameString(track, ct->tdb->track))
break;
}
-if ((!isCustomTrack(track) && dbIsFound) ||
- ((ct!= NULL) && (ct->dbTrackType != NULL) &&
- sameString(ct->dbTrackType, "maf")))
+if ((!isCustomTrack(track) && dbIsFound)
+|| ((ct!= NULL) && (ct->dbTrackType != NULL) && sameString(ct->dbTrackType, "maf")))
{
trackHash = makeTrackHashWithComposites(database, seqName, TRUE);
if (isHubTrack(track))
{
hubConnectAddHubForTrackAndFindTdb(database, track, NULL, trackHash);
}
if (parentWigMaf)
{
int wordCount, i;
char *words[16];
char *typeLine;
char *wigType = needMem(128);
tdb = hashFindVal(trackHash, parentWigMaf);
if (!tdb)
errAbort("can not find trackDb entry for parentWigMaf track %s.",