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/das/das.c src/hg/das/das.c index f7886fb..d84ba0a 100644 --- src/hg/das/das.c +++ src/hg/das/das.c @@ -297,31 +297,31 @@ return hashLookup(skips, name) != NULL; } static struct tableDef *getTables() /* Get all tables. */ { struct sqlConnection *conn = hAllocConn(database); struct hash *hash = newHash(0); struct tableDef *tdList = NULL, *td; struct sqlResult *sr; char **row; char *table, *root; boolean isSplit, hasBin; char chromField[32], startField[32], endField[32]; -sr = sqlGetResult(conn, "NOSQLINJ show tables"); +sr = sqlGetResult(conn, NOSQLINJ "show tables"); while ((row = sqlNextRow(sr)) != NULL) { table = root = row[0]; if (hFindFieldsAndBin(database, table, chromField, startField, endField, &hasBin)) { isSplit = tableIsSplit(table); if (isSplit) root = skipOverChrom(table); if (!skipTable(root) && dasableTrack(root)) { if ((td = hashFindVal(hash, root)) == NULL) { AllocVar(td); slAddHead(&tdList, td); hashAdd(hash, root, td); @@ -961,31 +961,31 @@ static void doEntryPoints() /* Handle entry points request. */ { struct sqlConnection *conn; struct sqlResult *sr; char **row; struct chromInfo *ci; normalHeader(); conn = hAllocConn(database); printf("<!DOCTYPE DASEP SYSTEM \"http://www.biodas.org/dtd/dasep.dtd\">\n"); printf("<DASEP>\n"); printf("<ENTRY_POINTS href=\"%s\" version=\"7.00\">\n", currentUrl()); -sr = sqlGetResult(conn, "NOSQLINJ select * from chromInfo"); +sr = sqlGetResult(conn, NOSQLINJ "select * from chromInfo"); while ((row = sqlNextRow(sr)) != NULL) { ci = chromInfoLoad(row); /* "chr"-less chromosome ID for clients such as Ensembl: */ if (startsWith("chr", ci->chrom)) printf(" <SEGMENT id=\"%s\" start=\"%d\" stop=\"%d\" orientation=\"+\" subparts=\"no\">%s</SEGMENT>\n", ci->chrom+3, 1, ci->size, ci->chrom+3); else printf(" <SEGMENT id=\"%s\" start=\"%d\" stop=\"%d\" orientation=\"+\" subparts=\"no\">%s</SEGMENT>\n", ci->chrom, 1, ci->size, ci->chrom); chromInfoFree(&ci); } printf("</ENTRY_POINTS>\n"); printf("</DASEP>\n"); }