bd0dd070091799dd2d4b78c2279a1342d1b7c7ba chinhli Wed Apr 9 12:15:19 2014 -0700 UCSC GB Track #11226Change the geneReviews tables of hg19 and hg18 to match NCBI. diff --git src/hg/hgGene/geneReviews.c src/hg/hgGene/geneReviews.c index fc6172c..c2acafd 100644 --- src/hg/hgGene/geneReviews.c +++ src/hg/hgGene/geneReviews.c @@ -1,89 +1,89 @@ /* GeneReviews - print out GeneReviews for this gene. */ #include "common.h" #include "hash.h" #include "hdb.h" #include "linefile.h" #include "dystring.h" #include "hgGene.h" static void geneReviewsPrint(struct section *section, struct sqlConnection *conn, char *itemName) /* print GeneReviews short label associated to this refGene item */ { char query[256]; char * geneSymbol; -if (sqlTableExists(conn, "geneReviewsRefGene")) +if (sqlTableExists(conn, "geneReviewsGeneGRshortNBKidGRtitle")) { sqlSafef(query, sizeof(query), "select geneSymbol from kgXref where kgId = '%s'", itemName); geneSymbol = sqlQuickString(conn, query); if (geneSymbol != NULL) { prGRShortKg(conn,geneSymbol); } else { hPrintf("No GeneReview for this gene
" ); } } } void prGRShortKg(struct sqlConnection *conn, char *itemName) /* print GeneReviews short label associated to this refGene item */ { struct sqlResult *sr; char **row; char query[512]; boolean firstTime = TRUE; -sqlSafef(query, sizeof(query), "select geneSymbol, grShort, diseaseID, diseaseName from geneReviewsRefGene where geneSymbol='%s'", itemName); +sqlSafef(query, sizeof(query), "select geneSymbol, grShort, NBKid, grTitle from geneReviewsGeneGRshortNBKidGRtitle where geneSymbol='%s'", itemName); sr = sqlGetResult(conn, query); while ((row = sqlNextRow(sr)) != NULL) { if (firstTime) { - printf("GeneReview(s) and GeneTest disease(s) related to gene %s:
", row[0]); + printf("GeneReviews article(s) related to gene %s:
", row[0]); firstTime = FALSE; } printf("%s",row[1], row[1]); printf(" ("); - printf("%s", row[3], row[3]); + printf("%s", row[2], row[3]); printf(")
"); } sqlFreeResult(&sr); } static boolean geneReviewsExists(struct section *section, struct sqlConnection *conn, char *geneId) -/* Return TRUE if geneReviewsRefGene table exist and have GeneReviews articles +/* Return TRUE if geneReviewsGeneGRshortNBKidGRtitle table exist and have GeneReviews articles * on this one. */ { char query[256]; char * geneSymbol; char * grSymbol; -if (sqlTableExists(conn, "geneReviewsRefGene")) +if (sqlTableExists(conn, "geneReviewsGeneGRshortNBKidGRtitle")) { sqlSafef(query, sizeof(query), "select geneSymbol from kgXref where kgId = '%s'", geneId); geneSymbol = sqlQuickString(conn, query); if (geneSymbol != NULL) { - sqlSafef(query, sizeof(query), "select geneSymbol from geneReviewsRefGene where geneSymbol='%s'", geneSymbol); + sqlSafef(query, sizeof(query), "select geneSymbol from geneReviewsGeneGRshortNBKidGRtitle where geneSymbol='%s'", geneSymbol); grSymbol = sqlQuickString(conn, query); if (grSymbol != NULL) { return TRUE; } } } return FALSE; } struct section *geneReviewsSection(struct sqlConnection *conn, struct hash *sectionRa) /* Create geneReviews section. */ { struct section *section = sectionNew(sectionRa, "geneReviews"); section->exists = geneReviewsExists; section->print = geneReviewsPrint; return section; }