f791276b36dc31cc87681692b2d43612ef9c6d78 angie Mon Mar 16 15:33:52 2015 -0700 Fixing something that slipped by me in code review and affects only my new code (cartJson.c is the only file that calls the affected function, hGetCladeOptions). diff --git src/hg/lib/hdb.c src/hg/lib/hdb.c index 2d8c5cc..ccee37b 100644 --- src/hg/lib/hdb.c +++ src/hg/lib/hdb.c @@ -4276,31 +4276,31 @@ struct slPair *hGetCladeOptions() /* Return a list of slPairs, each containing clade menu value (hgcentral.clade.name, e.g. 'mammal') * and clade menu label (hgcentral.clade.label, e.g. 'Mammal'), * useful for constructing a clade menu. */ { // get only the clades that have actual active genomes char *query = "NOSQLINJ " "SELECT DISTINCT(c.name), c.label " "FROM %s c, %s g, %s d " "WHERE c.name=g.clade AND d.organism=g.genome AND d.active=1 " "ORDER BY c.priority"; char queryBuf[4096]; safef(queryBuf, sizeof queryBuf, query, cladeTable(), genomeCladeTable(), dbDbTable()); struct sqlConnection *conn = hConnectCentral(); -struct slPair *nativeClades = sqlQuickPairList(conn, query); +struct slPair *nativeClades = sqlQuickPairList(conn, queryBuf); hDisconnectCentral(&conn); struct slPair *trackHubClades = trackHubGetCladeLabels(); return slCat(nativeClades, trackHubClades); } struct slPair *hGetGenomeOptionsForClade(char *clade) /* Return a list of slPairs, each containing genome menu value and menu label, * useful for constructing a genome menu for the given clade. */ { struct slPair *pairList = NULL; if (isHubTrack(clade)) { struct dbDb *hubDbDbList = trackHubGetDbDbs(clade), *dbDb;