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/simpleTracks.c src/hg/hgTracks/simpleTracks.c
index 27e02c4..45563ab 100644
--- src/hg/hgTracks/simpleTracks.c
+++ src/hg/hgTracks/simpleTracks.c
@@ -1842,31 +1842,31 @@
 
 if (!cartVarExists(cart, "gvDisclaimer"))
     {
     /* display disclaimer and add flag to cart, program exits from here */
     gvDisclaimer();
     }
 else if (sameString("Disagree", cartString(cart, "gvDisclaimer")))
     {
     /* hide track, remove from cart so will get option again later */
     tg->visibility = tvHide;
     cartRemove(cart, "gvDisclaimer");
     cartSetString(cart, "gvPos", "hide");
     return;
     }
 /* load as linked list once, outside of loop */
-srcList = gvSrcLoadByQuery(conn, "NOSQLINJ select * from hgFixed.gvSrc");
+srcList = gvSrcLoadByQuery(conn, NOSQLINJ "select * from hgFixed.gvSrc");
 /* load part need from gv table, outside of loop (load in hash?) */
 sr = hRangeQuery(conn, tg->table, chromName, winStart, winEnd, NULL, &rowOffset);
 while ((row = sqlNextRow(sr)) != NULL)
     {
     struct gv *details = NULL;
     char query[256];
     struct gvPos *el = gvPosLoad(row);
     sqlSafef(query, sizeof(query), "select * from hgFixed.gv where id = '%s'", el->name);
     details = gvLoadByQuery(conn2, query);
     /* searched items are always visible */
     if (hgFindMatches != NULL && hashIntValDefault(hgFindMatches, el->name, 0) == 1)
         slAddHead(&list, el);
     else if (!gvFilterType(details))
         gvPosFree(&el);
     else if (!gvFilterLoc(details))
@@ -5574,31 +5574,31 @@
 
 if (class != NULL)
     return TRUE;
 return FALSE;
 }
 
 static void loadFrames(struct sqlConnection *conn, struct linkedFeatures *lf)
 /* Load the CDS part of a genePredExt for codon display */
 {
 char query[4096];
 
 for(; lf; lf = lf->next)
     {
     struct genePred *gp = lf->original;
     gp->optFields |= genePredExonFramesFld | genePredCdsStatFld | genePredCdsStatFld;
-    safef(query, sizeof query, "NOSQLINJ select * from knownCds where name=\"%s\"",
+    safef(query, sizeof query, NOSQLINJ "select * from knownCds where name=\"%s\"",
 	gp->name);
 
     struct sqlResult *sr = sqlMustGetResult(conn, query);
     char **row = NULL;
     int sizeOne;
 
     while ((row = sqlNextRow(sr)) != NULL)
 	{
 	gp->cdsStartStat = parseCdsStat(row[1]);
 	gp->cdsEndStat = parseCdsStat(row[2]);
 	int exonCount = sqlUnsigned(row[3]);
 	if (exonCount != gp->exonCount)
 	    errAbort("loadFrames: %s number of exonFrames (%d) != number of exons (%d)",
 		     gp->name, exonCount, gp->exonCount);
 	sqlSignedDynamicArray(row[4], &gp->exonFrames, &sizeOne);