9ea3b0def2516a738157514e8b8cdd9ba7210766
tdreszer
  Thu Mar 24 16:31:03 2011 -0700
Made mdb dependent upon cv defines.  Made hgEncodeVocab use cv defines.
diff --git src/hg/inc/mdb.h src/hg/inc/mdb.h
index 0f06e9d..6b1c769 100644
--- src/hg/inc/mdb.h
+++ src/hg/inc/mdb.h
@@ -93,35 +93,36 @@
 
 #define MDB_DEFAULT_NAME     "metaDb"
 
 // The three mdb tuples
 #define MDB_OBJ                 "obj"
 #define MDB_VAR                 "var"
 #define MDB_VAL                 "val"
 
 // OBJECT TYPES
 #define MDB_OBJ_TYPE            "objType"
 #define MDB_OBJ_TYPE_TABLE      "table"
 #define MDB_OBJ_TYPE_FILE       "file"
 #define MDB_OBJ_TYPE_COMPOSITE  "composite"
 
 // WELL KNOWN MDB VARS
+#define MDB_VAR_PI              CV_TERM_GRANT
+#define MDB_VAR_LAB             CV_TERM_LAB
 #define MDB_VAR_COMPOSITE       MDB_OBJ_TYPE_COMPOSITE
-#define MDB_VAR_ANTIBODY        "antibody"
-#define MDB_VAR_CELL            "cell"
-#define MDB_VAR_LAB             "lab"
-#define MDB_VAR_DATATYPE        "dataType"
+#define MDB_VAR_ANTIBODY        CV_TERM_ANTIBODY
+#define MDB_VAR_CELL            CV_TERM_CELL
+#define MDB_VAR_DATATYPE        CV_TERM_DATA_TYPE
 #define MDB_VAR_TABLENAME       "tableName"
 #define MDB_VAR_FILENAME        "fileName"
 #define MDB_VAR_FILEINDEX       "fileIndex"
 #define MDB_VAR_DCC_ACCESSION   "dccAccession"
 #define MDB_VAR_PROJECT         "project"
 
 // ENCODE Specific (at least for now)
 #define MDB_VAL_ENCODE_PROJECT  "wgEncode"
 #define MDB_VAR_ENCODE_SUBID    "subId"
 #define MDB_VAR_ENCODE_EDVS     "expVars"
 #define MDB_VAR_ENCODE_EXP_ID   "expId"
 #define MDB_VAL_ENCODE_EDV_NONE "None"
 
 
 // The mdb holds metadata primarily for tables.