da4634bf1f2792c8742b4b8a28927ef82c65cea7 tdreszer Wed Mar 30 12:43:36 2011 -0700 Cleaned up fileSortOrderGet's discovery of sortable vars to use cv.ra searchable with a couple of exceptions diff --git src/hg/lib/cv.c src/hg/lib/cv.c index 174ab2d..f4c8cba 100644 --- src/hg/lib/cv.c +++ src/hg/lib/cv.c @@ -223,34 +223,34 @@ { // Get the list of term types from thew cv struct hash *termTypeHash = (struct hash *)cvTermTypeHash(); struct hash *termHash = hashFindVal(termTypeHash,term); if (termHash != NULL) { char *searchable = hashFindVal(termHash,CV_SEARCHABLE); if (searchable != NULL) { if (sameWord(searchable,CV_SEARCHABLE_SINGLE_SELECT)) return cvSearchBySingleSelect; if (sameWord(searchable,CV_SEARCHABLE_MULTI_SELECT)) return cvSearchByMultiSelect; if (sameWord(searchable,CV_SEARCHABLE_FREE_TEXT)) return cvSearchByFreeText; - //if (sameWord(searchable,"date")) - // return cvSearchByDateRange; - //if (sameWord(searchable,"numeric")) - // return cvSearchByIntegerRange; + if (sameWord(searchable,"date")) + return cvSearchByDateRange; + if (sameWord(searchable,"numeric")) + return cvSearchByIntegerRange; } } return cvNotSearchable; } const char *cvLabel(char *term) // returns cv label if term found or else just term { // Get the list of term types from thew cv struct hash *termTypeHash = (struct hash *)cvTermTypeHash(); struct hash *termHash = hashFindVal(termTypeHash,term); if (termHash != NULL) { char *label = hashFindVal(termHash,CV_LABEL); if (label != NULL)