21f1d2491968cb94da59b177c150c8c93632b1c2 hiram Tue Oct 1 10:53:57 2024 -0700 show the GCx accession id in the GenArk results refs #33720 diff --git src/hg/hgGateway/hgGateway.c src/hg/hgGateway/hgGateway.c index fc6bed2..75c6365 100644 --- src/hg/hgGateway/hgGateway.c +++ src/hg/hgGateway/hgGateway.c @@ -974,50 +974,54 @@ { /* remove trailing " or * characters, or beginning " + - characters */ if ('"' == lastChar(searchWords[i]) || '*' == lastChar(searchWords[i])) searchWords[i][strlen(searchWords[i])-1] = '\0'; else if ('"' == searchWords[i][0] || '+' == searchWords[i][0] || '-' == searchWords[i][0] ) searchWords[i] += 1; } struct gHubMatch *gHubMatch; for (gHubMatch = gHubMatchList; gHubMatch != NULL; gHubMatch = gHubMatch->next) { char *comBold = genarkBold(gHubMatch->commonName, searchWords[0]); char *sciBold = genarkBold(gHubMatch->scientificName, searchWords[0]); + char *gcxBold = genarkBold(gHubMatch->gcAccession, searchWords[0]); for (int i = 1; i < searchWordCount; ++i) { char *savePtr = comBold; comBold = genarkBold(savePtr, searchWords[i]); freeMem(savePtr); savePtr = sciBold; sciBold = genarkBold(savePtr, searchWords[i]); freeMem(savePtr); + savePtr = gcxBold; + gcxBold = genarkBold(savePtr, searchWords[i]); + freeMem(savePtr); } jsonWriteObjectStart(jw, NULL); jsonWriteString(jw, "genome", gHubMatch->gcAccession); jsonWriteString(jw, "db", gHubMatch->asmName); jsonWriteString(jw, "hubUrl", gHubMatch->hubUrl); jsonWriteString(jw, "scientificName", gHubMatch->scientificName); // Add a category label for customized autocomplete-with-categories. jsonWriteString(jw, "category", "UCSC GenArk - bulk-annotated assemblies from NCBI Genbank/RefSeq"); jsonWriteString(jw, "value", gHubMatch->asmName); // Use just the db as label, since shortLabel is included in the category label. - jsonWriteStringf(jw, "label", "%s - %s", comBold, sciBold); + jsonWriteStringf(jw, "label", "%s - %s (%s)", comBold, sciBold, gcxBold); jsonWriteObjectEnd(jw); } } /* maximum limit of how many matches to display from genark */ #define GENARK_LIMIT 20 static struct gHubMatch *filterGenarkMatches(char *genarkHubUrl, struct genark *matchList) /* Turn the sql results into a struct gHubMatch list */ { struct genark *match; struct gHubMatch *ret = NULL; int c = 0; for (match = matchList; match != NULL; match = match->next)