9062f6fdeb0ca4c2d05ebc6353804b812749f6f9
Merge parents 7d10203 c85c180
chinhli
  Mon Sep 12 16:14:31 2011 -0700
Merge branch 'master' into geneReviews
diff --cc src/hg/hgc/hgc.c
index fa2d14f,d8c32e5..856d18d
--- src/hg/hgc/hgc.c
+++ src/hg/hgc/hgc.c
@@@ -9721,50 -9724,33 +9724,50 @@@
  	printedCnt = 0;
  	while ((row = sqlNextRow(sr)) != NULL)
  	    {
  	    if (printedCnt < 1)
  		printf("<B>RefSeq Gene(s): </B>");
  	    else
  		printf(", ");
      	    printf("<A HREF=\"%s%s&o=%s&t=%s\">", "../cgi-bin/hgc?g=refGene&i=", row[0], chromStart, chromEnd);
      	    printf("%s</A></B>", row[0]);
  	    printedCnt++;
  	    }
          if (printedCnt >= 1) printf("<BR>\n");
  	}
      sqlFreeResult(&sr);
  
 +    // show GeneReviews  link(s)
 +    if (sqlTablesExist(conn, "geneReviews"))
 +        {
 +        safef(query, sizeof(query),
 +          "select distinct r.name2 from refLink l, mim2gene g, refGene r where l.omimId=%s and g.geneId=l.locusLinkId and g.entryType='gene' and chrom='%s' and txStart = %s and txEnd= %s",
 +        itemName, chrom, chromStart, chromEnd);
 +        sr = sqlMustGetResult(conn, query);
 +        if (sr != NULL)
 +            {
 +            while ((row = sqlNextRow(sr)) != NULL)
 +                {
 +                prGRShortRefGene(row[0]);
 +                }
 +            }
 +        sqlFreeResult(&sr);
 +        }
 +
      // show Related UCSC Gene links
      safef(query, sizeof(query),
-           "select distinct kgId from kgXref x, refLink l, mim2gene g where x.refseq = mrnaAcc and l.omimId=%s and g.omimId=l.omimId and g.entryType='gene'",
+           "select distinct kgId from kgXref x, refLink l, omim2gene g where x.refseq = mrnaAcc and l.omimId=%s and g.omimId=l.omimId and g.entryType='gene'",
  	  itemName);
      sr = sqlMustGetResult(conn, query);
      if (sr != NULL)
  	{
  	int printedCnt;
  	printedCnt = 0;
  	while ((row = sqlNextRow(sr)) != NULL)
  	    {
  	    if (printedCnt < 1)
  		printf("<B>Related UCSC Gene(s): </B>");
  	    else
  		printf(", ");
      	    printf("<A HREF=\"%s%s&hgg_chrom=none\">", "../cgi-bin/hgGene?hgg_gene=", row[0]);
      	    printf("%s</A></B>", row[0]);
  	    printedCnt++;