9482e36ee08c02a14318ac169433ded82394970d
tdreszer
  Thu May 19 13:59:47 2011 -0700
Added some defines to help with the new validateCv tool.
diff --git src/hg/inc/cv.h src/hg/inc/cv.h
index b79c31f..3482a71 100644
--- src/hg/inc/cv.h
+++ src/hg/inc/cv.h
@@ -4,58 +4,74 @@
 #ifndef CV_H
 #define CV_H
 
 #include "jksql.h"
 #define CV_FILE_NAME            "cv.ra"
 
 // CV Common settings
 #define CV_TERM                 "term"
 #define CV_TYPE                 "type"
 #define CV_LABEL                "label"
 #define CV_TAG                  "tag"
 #define CV_TARGET               "target"
 #define CV_TITLE                "title"
 #define CV_DESCRIPTION          "description"
 
+// CV Less common settings
+#define CV_GEO                  "geo"
+#define CV_LINEAGE              "lineage"
+#define CV_ORDER_URL            "orderUrl"
+#define CV_ORGANISM             "organism"
+#define CV_PROTOCOL             "protocol"
+#define CV_SEX                  "sex"
+#define CV_TERM_ID              "termId"
+#define CV_TERM_URL             "termUrl"
+#define CV_TIER                 "tier"
+#define CV_TISSUE               "tissue"
+#define CV_VENDOR_ID            "vendorId"
+#define CV_VENDER_NAME          "vendorName"
+
 // Type of Terms defines
 #define CV_TOT                  "typeOfTerm"
 #define CV_TOT_HIDDEN           "hidden"
 #define CV_TOT_CV_DEFINED       "cvDefined"
 #define CV_TOT_PRIORITY         "priority"
+#define CV_TOT_SEARCHABLE       "searchable"
 
 // Validation Rules
 #define CV_VALIDATE                 "validate"
 #define CV_VALIDATE_CV              "cv"
 #define CV_VALIDATE_CV_OR_NONE      "cv or None"
 #define CV_VALIDATE_CV_OR_CONTROL   "cv or control"
 #define CV_VALIDATE_DATE            "date"
 #define CV_VALIDATE_EXISTS          "exists"
 #define CV_VALIDATE_FLOAT           "float"
 #define CV_VALIDATE_INT             "integer"
 #define CV_VALIDATE_LIST            "list:"
 #define CV_VALIDATE_REGEX           "regex:"
 #define CV_VALIDATE_NONE            "none"
 
 // CV TERMS (NOTE: UGLY Terms in cv.ra are hidden inside cv.c APIS)
 #define CV_TERM_GRANT           "grant"
 #define CV_TERM_LAB             "lab"
 #define CV_TERM_CELL            "cell"
 #define CV_TERM_ANTIBODY        "antibody"
 #define CV_TERM_CONTROL         "control"
 #define CV_TERM_DATA_TYPE       "dataType"
 #define CV_TERM_LOCALIZATION    "localization"
 #define CV_TERM_VIEW            "view"
+#define CV_TERM_SEQ_PLATFORM    "seqPlatform"
 
 
 void cvFileDeclare(char *filePath);
 // Declare an altername cv.ra file to use
 // (The cv.ra file is normally discovered based upon CGI/Tool and envirnment)
 
 char *cvTypeNormalized(char *sloppyTerm);
 // returns (on stack) the proper term to use when requesting a typeOfTerm
 
 char *cvTermNormalized(char *sloppyTerm);
 // returns (on stack) the proper term to use when requesting a cvTerm hash
 
 const struct hash *cvTermHash(char *term);
 // returns a hash of hashes of a term which should be defined in cv.ra
 // NOTE: in static memory: DO NOT FREE