b7749ec648f88880da646bca0bba1a14f288639c hiram Wed Mar 20 18:13:15 2019 -0700 adding hubPublic.c and .h to library refs #18869 diff --git src/hg/hubApi/list.c src/hg/hubApi/list.c index b464631..958811e 100644 --- src/hg/hubApi/list.c +++ src/hg/hubApi/list.c @@ -27,31 +27,31 @@ jsonWriteString(jw, NULL, el->registrationTime); jsonWriteNumber(jw, NULL, (long long)el->dbCount); jsonWriteString(jw, NULL, el->dbList); jsonWriteString(jw, NULL, el->descriptionUrl); jsonWriteListEnd(jw); #endif } static void jsonPublicHubs() /* output the hubPublic SQL table */ { struct sqlConnection *conn = hConnectCentral(); char *dataTime = sqlTableUpdate(conn, hubPublicTableName()); time_t dataTimeStamp = sqlDateToUnixTime(dataTime); replaceChar(dataTime, ' ', 'T'); /* ISO 8601 */ -struct hubPublic *el = hubPublicLoadAll(); +struct hubPublic *el = hubPublicDbLoadAll(); struct jsonWrite *jw = apiStartOutput(); jsonWriteString(jw, "dataTime", dataTime); jsonWriteNumber(jw, "dataTimeStamp", (long long)dataTimeStamp); freeMem(dataTime); // redundant: jsonWriteString(jw, "tableName", hubPublicTableName()); char **columnNames = NULL; char **columnTypes = NULL; int columnCount = tableColumns(conn, jw, hubPublicTableName(), &columnNames, &columnTypes); jsonWriteListStart(jw, "publicHubs"); for ( ; el != NULL; el = el->next ) { hubPublicJsonData(jw, el, columnCount, columnNames); } jsonWriteListEnd(jw); jsonWriteObjectEnd(jw);