5b8c4168d4807c729fc8b1f199d9eb03c9411069 galt Thu Mar 3 18:40:54 2016 -0800 Replacing simple literal NOSQLINJ in string with the #define NOSQLINJ. This is slightly better because the compiler can catch a mis-spelling of the NOSQLINJ keyword. This was suggested by Angie. diff --git src/hg/hgTracks/hgTracks.c src/hg/hgTracks/hgTracks.c index 40f6534..03a76f6 100644 --- src/hg/hgTracks/hgTracks.c +++ src/hg/hgTracks/hgTracks.c @@ -3799,31 +3799,31 @@ } slReverse(&virtRegionList); //if (winCount >= 2) // withNextExonArrows = FALSE; /* Display next exon navigation buttons near center labels? */ //warn("winCount=%d, exonSize=%d, intronSize=%d", winCount, exonSize, intronSize); } void initAllChroms() /* initialize virt region list for main chromosomes */ { struct sqlConnection *conn = hAllocConn(database); struct sqlResult *sr; char **row; int winCount = 0; char *query = -"NOSQLINJ select chrom, size from chromInfo" +NOSQLINJ "select chrom, size from chromInfo" " where chrom like 'chr%'" " and chrom not like '%_random'" " and chrom not like 'chrUn%'"; // allow alternate haplotypes for now //" and chrom not like '%_hap%'" //" and chrom not like '%_alt'" //warn("%s",query); struct virtRegion *v; sr = sqlGetResult(conn, query); while ((row = sqlNextRow(sr)) != NULL) { unsigned chromSize = sqlUnsigned(row[1]); AllocVar(v); v->chrom = cloneString(row[0]); v->start = 1 - 1; @@ -9115,36 +9115,36 @@ if (trackHubDatabase(database)) { chromInfoRowsNonChromTrackHub(limit); return; } struct sqlConnection *conn = hAllocConn(database); struct sqlResult *sr = NULL; char **row = NULL; long long total = 0; char query[512]; char msg1[512], msg2[512]; int seqCount = 0; boolean truncating; -seqCount = sqlQuickNum(conn, "NOSQLINJ select count(*) from chromInfo"); +seqCount = sqlQuickNum(conn, NOSQLINJ "select count(*) from chromInfo"); truncating = (limit > 0) && (seqCount > limit); if (!truncating) { - sr = sqlGetResult(conn, "NOSQLINJ select chrom,size from chromInfo order by size desc"); + sr = sqlGetResult(conn, NOSQLINJ "select chrom,size from chromInfo order by size desc"); } else { sqlSafef(query, sizeof(query), "select chrom,size from chromInfo order by size desc limit %d", limit); sr = sqlGetResult(conn, query); } while ((row = sqlNextRow(sr)) != NULL) { unsigned size = sqlUnsigned(row[1]); cgiSimpleTableRowStart(); cgiSimpleTableFieldStart(); printf("<A HREF=\"%s?%s=%s&position=%s\">%s</A>", hgTracksName(), cartSessionVarName(), cartSessionId(cart),