df2d933d6b8b978676cea3f42b1d16a1b31c0276 tdreszer Mon Aug 29 16:02:19 2011 -0700 Be sure to print mdb validation errors to std out, but return non-zero value when invalids diff --git src/hg/lib/mdb.c src/hg/lib/mdb.c index 33c99f1..6129fe7 100644 --- src/hg/lib/mdb.c +++ src/hg/lib/mdb.c @@ -2480,33 +2480,33 @@ if (sameString(mdbVar->var,MDB_OBJ_TYPE) && ( sameString(mdbVar->val,MDB_OBJ_TYPE_TABLE) || sameString(mdbVar->val,MDB_OBJ_TYPE_FILE) || sameString(mdbVar->val,MDB_OBJ_TYPE_COMPOSITE))) continue; printf("INVALID %s '%s' not defined in %s: %s = %s in %s: %s\n",CV_TERM, mdbVar->var,CV_FILE_NAME,mdbVar->var,mdbVar->val,MDB_OBJ,mdbObj->obj); invalids++; continue; } char reason[256]; boolean valid = cvValidateTerm(mdbVar->var,mdbVar->val,reason,sizeof(reason)); if (!valid) { if (startsWith("ERROR in ",reason)) - verbose(1,"%s\n",reason); + printf("%s\n",reason); else - verbose(1,"%s in %s: %s\n",reason,MDB_OBJ,mdbObj->obj); + printf("%s in %s: %s\n",reason,MDB_OBJ,mdbObj->obj); invalids++; } } } return invalids; } static struct slName *mdbObjGetNamedEncodeEdvs(struct mdbObj *compObj) // returns NULL or the list of EDVs defined for this composite { char *edvs = mdbObjFindValue(compObj,MDB_VAR_ENCODE_EDVS); if (edvs == NULL) return NULL; edvs = cloneString(edvs);