8ea322638d617b5598935df2dc7daf7199064b71 hiram Wed Feb 10 11:46:16 2016 -0800 code review clean up refs #16795 diff --git src/hg/hgc/hgc.c src/hg/hgc/hgc.c index befa85c..5caabba 100644 --- src/hg/hgc/hgc.c +++ src/hg/hgc/hgc.c @@ -11372,54 +11372,53 @@ printf("<P>%s</P>\n", summary); freeMem(summary); } htmlHorizontalLine(); return rl; } void doNcbiRefSeq(struct trackDb *tdb, char *itemName) /* Process click on a NCBI RefSeq gene. */ { struct sqlConnection *conn = hAllocConn(database); struct sqlResult *sr; char **row; char query[256]; -char *sqlRnaName = itemName; struct ncbiRefSeqLink *nrl; struct dyString *dy = newDyString(1024); dyStringPrintf(dy, "%s - %s ", tdb->longLabel, itemName); struct trackVersion *trackVersion = getTrackVersion(database, "ncbiRefSeq"); if ((trackVersion != NULL) && !isEmpty(trackVersion->version)) dyStringPrintf(dy, "- Release %s\n", trackVersion->version); cartWebStart(cart, database, "%s", dy->string); /* get refLink entry */ -sqlSafef(query, sizeof(query), "select * from ncbiRefSeqLink where id = '%s'", sqlRnaName); +sqlSafef(query, sizeof(query), "select * from ncbiRefSeqLink where id = '%s'", itemName); sr = sqlGetResult(conn, query); if ((row = sqlNextRow(sr)) == NULL) errAbort("Couldn't find %s in ncbiRefSeqLink table.", itemName); nrl = ncbiRefSeqLinkLoad(row); sqlFreeResult(&sr); printf("<h2>RefSeq Gene %s</h2><br>\n", nrl->name); -printf("<b>RefSeq:</b> <a href=\""); +printf("<b>RefSeq:</b> <a href='"); printEntrezNucleotideUrl(stdout, nrl->id); -printf("\" target=_blank>%s</a>", nrl->id); +printf("' target=_blank>%s</a>", nrl->id); printf(" <b>Status: </b>%s<br>\n", nrl->status); printf("<b>Description:</b> %s<br>\n", nrl->product); if (differentWord(nrl->gbkey, "n/a")) { printf("<b>Molecule type:</b> %s<br>\n", nrl->gbkey); } if (differentWord(nrl->pseudo, "n/a")) { printf("<b>Pseudogene:</b> %s<br>\n", nrl->pseudo); } if (differentWord(nrl->source, "n/a")) { printf("<b>Source:</b> %s<br>\n", nrl->source); } if (differentWord(nrl->gene_biotype, "n/a")) @@ -11428,91 +11427,90 @@ } if (differentWord(nrl->gene_synonym, "n/a")) { printf("<b>Synonyms:</b> %s<br>\n", nrl->gene_synonym); } if (differentWord(nrl->ncrna_class, "n/a")) { printf("<b>ncRNA class:</b> %s<br>\n", nrl->ncrna_class); } if (differentWord(nrl->note, "n/a")) { printf("<b>Other notes:</b> %s<br>\n", nrl->note); } if (differentWord(nrl->omimId, "n/a")) { - printf("<b>OMIM:</b> <a href=\""); + printf("<b>OMIM:</b> <a href='"); printEntrezOMIMUrl(stdout, sqlSigned(nrl->omimId)); - printf("\" target=_blank>%s</a><br>\n", nrl->omimId); + printf("' target=_blank>%s</a><br>\n", nrl->omimId); } if (differentWord(nrl->mrnaAcc, "n/a") && differentWord(nrl->mrnaAcc,nrl->id)) { printf("<b>mRNA:</b> "); - printf("<a href=\"http://www.ncbi.nlm.nih.gov/nuccore/%s\" target=_blank>", nrl->mrnaAcc); + printf("<a href='http://www.ncbi.nlm.nih.gov/nuccore/%s' target=_blank>", nrl->mrnaAcc); printf("%s</a><br>\n", nrl->mrnaAcc); } if (differentWord(nrl->genbank, "n/a") && differentWord(nrl->genbank,nrl->id)) { printf("<b>Genbank:</b> "); - printf("<a href=\"http://www.ncbi.nlm.nih.gov/nuccore/%s\" target=_blank>", nrl->genbank); + printf("<a href='http://www.ncbi.nlm.nih.gov/nuccore/%s' target=_blank>", nrl->genbank); printf("%s</a><br>\n", nrl->genbank); } if (differentWord(nrl->protAcc, "n/a")) { printf("<b>Protein:</b> "); - printf("<a href=\"http://www.ncbi.nlm.nih.gov/protein/%s\" target=_blank>", nrl->protAcc); + printf("<a href='http://www.ncbi.nlm.nih.gov/protein/%s' target=_blank>", nrl->protAcc); printf("%s</a><br>\n", nrl->protAcc); } if (differentWord(nrl->hgnc, "n/a")) { printf("<b>HGNC:</b> "); - printf("<a href=\"http://www.genenames.org/cgi-bin/gene_symbol_report?hgnc_id=HGNC:%s\" target=_blank>", nrl->hgnc); + printf("<a href='http://www.genenames.org/cgi-bin/gene_symbol_report?hgnc_id=HGNC:%s' target=_blank>", nrl->hgnc); printf("%s</a><br>\n", nrl->hgnc); } if (differentWord(nrl->locusLinkId, "n/a")) { printf("<b>Entrez Gene:</b> "); - printf("<a href=\"http://www.ncbi.nlm.nih.gov/entrez/query.fcgi?db=gene&cmd=Retrieve&dopt=Graphics&list_uids=%s\" TARGET=_blank>", + printf("<a href='http://www.ncbi.nlm.nih.gov/entrez/query.fcgi?db=gene&cmd=Retrieve&dopt=Graphics&list_uids=%s' TARGET=_blank>", nrl->locusLinkId); printf("%s</a><br>\n", nrl->locusLinkId); } if (differentWord(nrl->name,"n/a")) { printGeneCards(nrl->name); if (startsWith("hg", database)) { printf("<b>AceView:</b> "); - printf("<a href = \"http://www.ncbi.nlm.nih.gov/IEB/Research/Acembly/av.cgi?db=human&l=%s\" target=_blank>", + printf("<a href = 'http://www.ncbi.nlm.nih.gov/IEB/Research/Acembly/av.cgi?db=human&l=%s' target=_blank>", nrl->name); printf("%s</a><br>\n", nrl->name); } } if ((trackVersion != NULL) && !isEmpty(trackVersion->version)) { - printf("<B>Annotation Release:</B> <A href=\"%s\" TARGET=_blank> %s <BR></A>", trackVersion->comment, trackVersion->version); + printf("<B>Annotation Release:</B> <A href='%s' TARGET=_blank> %s <BR></A>", trackVersion->comment, trackVersion->version); } htmlHorizontalLine(); if (differentWord("n/a", nrl->description)) { printf("Summary of <b>%s</b><br>\n%s<br>\n", nrl->name, nrl->description); htmlHorizontalLine(); } - struct psl *pslList = getAlignments(conn, "ncbiRefSeqPsl", itemName); // if the itemName isn't found, it might be found as the nrl->mrnaAcc if (! pslList) pslList = getAlignments(conn, "ncbiRefSeqPsl", nrl->mrnaAcc); if (pslList) { int start = cartInt(cart, "o"); printf("<H3>mRNA/Genomic Alignments</H3>"); printAlignments(pslList, start, "ncbiRefSeqPsl", "ncbiRefSeqPsl", itemName); } else { printf ("<h4>there is NO alignment for %s</h4><br>\n", itemName); }