eb81fe8c39c5be59e32291a7533131eb50a95b51 galt Fri May 27 19:49:45 2022 -0700 minor fix for NOSQLINJv2, needs sql safe functions calling getHubSearchResults in searchTracks.c. refs #29274 diff --git src/hg/hgTracks/searchTracks.c src/hg/hgTracks/searchTracks.c index 4c0c6da..d0a633d 100644 --- src/hg/hgTracks/searchTracks.c +++ src/hg/hgTracks/searchTracks.c @@ -469,33 +469,33 @@ void addHubSearchResults(struct slName *nameList, char *descSearch) /* add public hubs to the track list */ { struct sqlConnection *conn = hConnectCentral(); char *hubSearchTableName = hubSearchTextTableName(); char *publicTable = cfgOptionEnvDefault("HGDB_HUB_PUBLIC_TABLE", hubPublicTableConfVariable, defaultHubPublicTableName); char *statusTable = cfgOptionEnvDefault("HGDB_HUB_STATUS_TABLE", hubStatusTableConfVariable, defaultHubStatusTableName); struct dyString *extra = dyStringNew(0); if (nameList) { struct slName *tmp = NULL; for (tmp = nameList; tmp != NULL; tmp = tmp->next) { - dyStringPrintf(extra, "label like '%%%s%%'", tmp->name); + sqlDyStringPrintf(extra, "label like '%%%s%%'", tmp->name); if (tmp->next) - dyStringPrintf(extra, " and "); + sqlDyStringPrintf(extra, " and "); } } if (sqlTableExists(conn, hubSearchTableName)) { struct hash *searchResultsHash = hashNew(0); struct hash *pHash = hashNew(0); struct slName *hubsToPrint = NULL; addPublicHubsToHubStatus(cart, conn, publicTable, statusTable); struct hash *hubLookup = buildPublicLookupHash(conn, publicTable, statusTable, &pHash); char *db = cloneString(trackHubSkipHubName(database)); tolowers(db); getHubSearchResults(conn, hubSearchTableName, descSearch, isNotEmpty(descSearch), db, hubLookup, &searchResultsHash, &hubsToPrint, dyStringCannibalize(&extra)); hubSearchHashToPfdList(descSearch, searchResultsHash, hubLookup, conn); if (measureTiming)