caaf5cefb276c8f48858912d249156bcb45477d3 tdreszer Wed Apr 20 14:55:34 2011 -0700 Support for cv.ra typeOfTerm hidden being alpha,beta,public diff --git src/hg/lib/hui.c src/hg/lib/hui.c index 015322f..802e93c 100644 --- src/hg/lib/hui.c +++ src/hg/lib/hui.c @@ -207,31 +207,31 @@ dyStringAppend(dyTable,htmlStringForDownloadsLink(db, tdb, file->name, TRUE, trackHash)); if (fileSet != NULL) dyStringAppend(dyTable,"<BR>"); slNameFree(&file); } #endif///ndef NO_FILENAME_LISTS dyStringAppend(dyTable,"</td></tr>"); } else { if (cvTermTypes && differentString(mdbVar->var,MDB_VAR_TABLENAME)) // Don't bother with tableName { struct hash *cvTerm = hashFindVal(cvTermTypes,mdbVar->var); if (cvTerm != NULL) { - if(SETTING_NOT_ON(hashFindVal(cvTerm,CV_TOT_HIDDEN))) // NULL is not on + if(!cvTermIsHidden(mdbVar->var)) { char *label=hashFindVal(cvTerm,CV_LABEL); if (label == NULL) label = mdbVar->var; char *linkOfType = controlledVocabLink(NULL,CV_TYPE,mdbVar->var,label,label,NULL); char *cvDefined=hashFindVal(cvTerm,CV_TOT_CV_DEFINED); if (cvDefined != NULL && !SETTING_IS_OFF(cvDefined)) // assume setting is ON { char *linkOfTerm = controlledVocabLink(NULL,CV_TERM,mdbVar->val,mdbVar->val,mdbVar->val,NULL); dyStringPrintf(dyTable,"<tr valign='bottom'><td align='right' nowrap><i>%s:</i></td><td nowrap>%s</td></tr>",linkOfType,linkOfTerm); freeMem(linkOfTerm); } else dyStringPrintf(dyTable,"<tr valign='bottom'><td align='right' nowrap><i>%s:</i></td><td nowrap>%s</td></tr>",linkOfType,mdbVar->val); //{ // NOTE: Could just have a tool tip for these.