aab7eb309928e1ffedf18e8cf017dab5c86cfc08 ccpowell Thu Aug 8 14:19:17 2019 -0700 Fixing GO subSection links, refs #23939 diff --git src/hg/hgGene/go.c src/hg/hgGene/go.c index 8733071..290a929 100644 --- src/hg/hgGene/go.c +++ src/hg/hgGene/go.c @@ -71,38 +71,74 @@ " and %s.fbGo.aspect = '%s'", database, database, acc, database, database, aspects[aspectIx]); else sqlSafef(query, sizeof(query), "select term.acc,term.name" " from goaPart,term" " where goaPart.dbObjectId = '%s'" " and goaPart.goId = term.acc" " and goaPart.aspect = '%s'" , acc, aspects[aspectIx]); sr = sqlGetResult(goConn, query); while ((row = sqlNextRow(sr)) != NULL) { char *goID = row[0]; char *goTermName = row[1]; + /* if (!hasFirst) + { + hPrintf("<B>good, %s:</B><BR>", aspectNames[aspectIx]); + hasFirst = TRUE; + } + if ( strcmp(aspectNames[aspectIx], "Molecular Function") == 0) + { + hPrintf("<A HREF = \""); + hPrintf("http://amigo.geneontology.org/amigo/search/ontology?q=%s", goID); + hPrintf("\" TARGET=_blank>%s</A> %s<BR>\n", goID, goTermName); + } + else if ( strcmp(aspectNames[aspectIx], "Biological Process") == 0) + { + hPrintf("<A HREF = \""); + hPrintf("http://amigo.geneontology.org/amigo/search/bioentity?q=%s", goID); + hPrintf("\" TARGET=_blank>%s</A> %s<BR>\n", goID, goTermName); + } + else if ( strcmp(aspectNames[aspectIx], "Cellular Component") == 0) + { + hPrintf("<A HREF = \""); + hPrintf("http://amigo.geneontology.org/amigo/search/annotation?q=%s", goID); + hPrintf("\" TARGET=_blank>%s</A> %s<BR>\n", goID, goTermName); + } */ if (!hasFirst) { - hPrintf("<B>%s:</B><BR>", aspectNames[aspectIx]); + hPrintf("<B>good, %s:</B><BR>", aspectNames[aspectIx]); hasFirst = TRUE; } hPrintf("<A HREF = \""); - hPrintf("http://amigo1.geneontology.org/cgi-bin/amigo/go.cgi?view=details&search_constraint=terms&depth=0&query=%s", goID); + if ( strcmp(aspectNames[aspectIx], "Molecular Function") == 0) + { + hPrintf("http://amigo.geneontology.org/amigo/search/ontology?q=%s", goID); + } + else if ( strcmp(aspectNames[aspectIx], "Biological Process") == 0) + { + hPrintf("http://amigo.geneontology.org/amigo/search/bioentity?q=%s", goID); + } + else if ( strcmp(aspectNames[aspectIx], "Cellular Component") == 0) + { + hPrintf("http://amigo.geneontology.org/amigo/search/annotation?q=%s", goID); + } + hPrintf("\" TARGET=_blank>%s</A> %s<BR>\n", goID, goTermName); + } if (hasFirst) hPrintf("<BR>"); sqlFreeResult(&sr); } hFreeConn(&goConn); } struct section *goSection(struct sqlConnection *conn, struct hash *sectionRa) /* Create GO annotations section. */ { struct section *section = sectionNew(sectionRa, "go"); section->exists = goExists; section->print = goPrint;