c3786681696b93476299dfbfb832b355035861b1 hiram Sat Jun 29 15:13:45 2024 -0700 ready for an upgrade to the genark table to add columns currently maintain compatible behavior with previous genark table refs #32596; diff --git src/hg/hubApi/list.c src/hg/hubApi/list.c index 312b4b5..d2e52c2 100644 --- src/hg/hubApi/list.c +++ src/hg/hubApi/list.c @@ -58,30 +58,34 @@ static void genArkJsonData(struct jsonWrite *jw, struct genark *el, int columnCount, char **columnNames) /* Print out genark table element in JSON format. * must be same as was stated in the columnName header element */ { int i = 0; jsonWriteObjectStart(jw, el->gcAccession); i++; // redundant: jsonWriteString(jw, NULL, el->gcAccession); jsonWriteString(jw, columnNames[i++], el->hubUrl); jsonWriteString(jw, columnNames[i++], el->asmName); jsonWriteString(jw, columnNames[i++], el->scientificName); jsonWriteString(jw, columnNames[i++], el->commonName); jsonWriteNumber(jw, columnNames[i++], (long long)el->taxId); +if (columnCount > 6) + jsonWriteNumber(jw, columnNames[i++], (long long)el->priority); +if (columnCount > 7) + jsonWriteString(jw, columnNames[i++], el->clade); jsonWriteObjectEnd(jw); } static void dbDbJsonData(struct jsonWrite *jw, struct dbDb *el, int columnCount, char **columnNames) /* Print out dbDb table element in JSON format. * must be same as was stated in the columnName header element * This code should be over in hg/lib/dbDb.c */ { int i = 0; jsonWriteObjectStart(jw, el->name); i++; // redundant: jsonWriteString(jw, NULL, el->name); jsonWriteString(jw, columnNames[i++], el->description);