src/hg/hgc/hgc.c 1.1533

Index: src/hg/hgc/hgc.c
===================================================================
RCS file: /projects/compbio/cvsroot/kent/src/hg/hgc/hgc.c,v
retrieving revision 1.1532
retrieving revision 1.1533
diff -b -B -U 4 -r1.1532 -r1.1533
--- src/hg/hgc/hgc.c	4 May 2009 21:23:24 -0000	1.1532
+++ src/hg/hgc/hgc.c	5 May 2009 22:48:31 -0000	1.1533
@@ -2317,19 +2317,8 @@
 puts("<LI>\n");
 hgcAnchorSomewhere(genomicClick, geneName, geneTable, seqName);
 printf("Genomic Sequence</A> from assembly\n");
 puts("</LI>\n");
-if(sameString(tdb->type,"genePred") && startsWith("ENCODE Gencode",tdb->longLabel))
-    {
-#define VEGA_TRANSCRIPTID_LINK    "<a href=\"http://vega.sanger.ac.uk/Homo_sapiens/transview?transcript=%s\" target=\"_blank\">Vega Transcript Report</a> from transcript Id."
-#define ENSEMBL_TRANSCRIPTID_LINK "<a href=\"http://www.ensembl.org/Homo_sapiens/Transcript/Summary?db=core;t=%s\" target=\"_blank\">Ensembl Transcript Report</a> from transcript Id."
-    puts("<LI>\n");
-    if(startsWith("OTTHUM",geneName))
-        printf(VEGA_TRANSCRIPTID_LINK,geneName);
-    else if(startsWith("ENST",geneName))
-        printf(ENSEMBL_TRANSCRIPTID_LINK,geneName);
-    puts("</LI>\n");
-    }
 printf("</UL>\n");
 }
 
 void geneShowPosAndLinksDNARefseq(char *geneName, char *pepName, struct trackDb *tdb,
@@ -2509,20 +2498,32 @@
 
 void printDataVersion(struct trackDb *tdb)
 /* If this annotation has a dataVersion trackDb setting, print it */
 {
-char *version;
-if ((version = trackDbSetting(tdb, "dataVersion")) != NULL)
+char *version = metadataSettingFind(tdb,"dataVersion");
+if(version != NULL)
+    {
+    printf("<B>Data version:</B> %s <BR>\n", version);
+    freeMem(version);
+    }
+else
+    {
+    version = trackDbSetting(tdb,"dataVersion");
+    if (version != NULL)
     printf("<B>Data version:</B> %s <BR>\n", version);
+    }
 }
 
 void printDataRestrictionDate(struct trackDb *tdb)
 /* If this annotation has a dateUnrestricted trackDb setting, print it */
 {
-char *restrictionDate;
-if ((restrictionDate = trackDbSetting(tdb, "dateUnrestricted")) != NULL)
+char *restrictionDate = encodeRestrictionDateDisplay(tdb);
+if (restrictionDate != NULL)
+    {
     printf("<A HREF=\"/ENCODE/terms.html\" TARGET=_BLANK><B>Restricted until</A>:</B> %s <BR>\n", 
                 restrictionDate);
+    freeMem(restrictionDate);
+    }
 }
 
 void printOrigAssembly(struct trackDb *tdb)
 /* If this annotation has been lifted, print the original