386b5d76ae4c1625e3da1421d4f2a73628ef6048
kent
  Wed Feb 21 14:06:22 2024 -0800
Making cdwSubmit tag names against a schema file in the cdwSettings rather than hard-coded (and currently ifdefed out) tables.

diff --git src/hg/cirm/cdw/inc/cdwValid.h src/hg/cirm/cdw/inc/cdwValid.h
index f54fad8..1b33f42 100644
--- src/hg/cirm/cdw/inc/cdwValid.h
+++ src/hg/cirm/cdw/inc/cdwValid.h
@@ -1,67 +1,67 @@
 /* Things to do with CIRM validation. */
 
 /* Copyright (C) 2013 The Regents of the University of California 
  * See kent/LICENSE or http://genome.ucsc.edu/license/ for licensing information. */
 
 #ifndef CDWVALID_H
 #define CDWVALID_H
 
 char *cdwCalcValidationKey(char *md5Hex, long long fileSize);
 /* calculate validation key to discourage faking of validation.  Do freeMem on 
  *result when done. */
 
 void cdwValidateRcc(char *path);
 /* Validate a nanostring rcc file. */
 
 void cdwValidateIdat(char *path);
 /* Validate illumina idat file. */
 
 void cdwValidatePdf(char *path);
 /* Make sure PDF really is PDF */
 
 void cdwValidateCram(char *path);
 /* Validate cram file. */
 
 void cdwValidateJpg(char *path);
 /* Check jpg file is really jpg */
 
 void cdwValidatePng(char *path);
 /* Check png file is really png */
 
 void cdwValidateBamIndex(char *path);
 /* Check .bam.bai really is index. */
 
 void cdwValidateTabixIndex(char *path);
 /* Check that a tabix index file (used for VCF files among other things) starts with right characters */
 
 boolean cdwIsGzipped(char *path);
 /* Return TRUE if file at path starts with GZIP signature */
 
 boolean cdwCheckEnrichedIn(char *enriched);
 /* return TRUE if value is allowed */
 
 struct cdwBedType 
 /* Contain information about our beds with defined as files like narrowPeak. */
     {
     char *name;	    /* Base name without .as suffix */
     int bedFields;  /* Fields based on bed spec - come first */
     int extraFields; /* Beds past bed spec */
     };
 
 extern struct cdwBedType cdwBedTypeTable[];	/* Table of supported bed types */
 extern int cdwBedTypeCount;			/* Size of above table. */
 
 struct cdwBedType *cdwBedTypeFind(char *name);
 /* Return cdwBedType of given name.  Abort if not found */
     
 struct cdwBedType *cdwBedTypeMayFind(char *name);
 /* Return cdwBedType of given name, just return NULL if not found. */
 
-void cdwValidateTagName(char *tag);
+void cdwValidateTagName(char *tag, struct hash *schemaHash);
 /* Make sure that tag is one of the allowed ones. */
 
 struct slPair *cdwFormatList();
 /* Return list of formats.  The name of the list items are the format names.
  * The vals are short descriptions. */
 
 #endif /* CDWVALID_H */