src/hg/hgc/hgc.c 1.1611
1.1611 2010/04/12 16:19:42 tdreszer
Full support for the new metaTbl based metadata for ENCODE tracks. Uses sandbox table if one is found.
Index: src/hg/hgc/hgc.c
===================================================================
RCS file: /projects/compbio/cvsroot/kent/src/hg/hgc/hgc.c,v
retrieving revision 1.1610
retrieving revision 1.1611
diff -b -B -U 4 -r1.1610 -r1.1611
--- src/hg/hgc/hgc.c 10 Apr 2010 06:41:01 -0000 1.1610
+++ src/hg/hgc/hgc.c 12 Apr 2010 16:19:42 -0000 1.1611
@@ -227,8 +227,9 @@
#include "jsHelper.h"
#include "virusClick.h"
#include "gwasCatalog.h"
#include "parClick.h"
+#include "metaTbl.h"
static char const rcsid[] = "$Id$";
static char *rootDir = "hgcData";
@@ -2513,14 +2514,12 @@
void printDataVersion(struct trackDb *tdb)
/* If this annotation has a dataVersion trackDb setting, print it */
{
-char *version = metadataSettingFind(tdb,"dataVersion");
+(void)metadataForTable(database,tdb,NULL);
+const char *version = metadataFindValue(tdb,"dataVersion");
if(version != NULL)
- {
printf("<B>Data version:</B> %s <BR>\n", version);
- freeMem(version);
- }
else
{
version = trackDbSetting(tdb,"dataVersion");
if (version != NULL)
@@ -2530,9 +2529,9 @@
void printDataRestrictionDate(struct trackDb *tdb)
/* If this annotation has a dateUnrestricted trackDb setting, print it */
{
-char *restrictionDate = encodeRestrictionDateDisplay(tdb);
+char *restrictionDate = encodeRestrictionDateDisplay(database,tdb);
if (restrictionDate != NULL)
{
printf("<A HREF=\"/ENCODE/terms.html\" TARGET=_BLANK><B>Restricted until</A>:</B> %s <BR>\n",
restrictionDate);