9723799cf6f1a8fb714ae1493b224b8e91aebf09 tdreszer Mon Jul 30 12:17:38 2012 -0700 Making final pass through tree of checkins as dictated by Jim. None of these changes should affect executables in any way. This pass is due to expanding fingerprint caused by kompare. diff --git src/hg/lib/search.c src/hg/lib/search.c index 0592bc0..2b89f5b 100644 --- src/hg/lib/search.c +++ src/hg/lib/search.c @@ -289,31 +289,30 @@ static boolean searchMatchToken(char *string, char *token) { // do this with regex ? Would require all sorts of careful parsing for ()., etc. if (string == NULL) return (token == NULL); if (token == NULL) return TRUE; if (!strchr(token,'*') && !strchr(token,'?')) return (strcasestr(string,token) != NULL); char wordWild[1024]; safef(wordWild,sizeof wordWild,"*%s*",token); return wildMatch(wordWild, string); - } boolean searchNameMatches(struct trackDb *tdb, struct slName *wordList) // returns TRUE if all words in preparsed list matches short or long label // A "word" can be "multiple words" (parsed from quoteed string). { if (tdb->shortLabel == NULL || tdb->longLabel == NULL) return (wordList != NULL); struct slName *word = wordList; for (; word != NULL; word = word->next) { if (!searchMatchToken(tdb->shortLabel,word->name) && !searchMatchToken(tdb->longLabel, word->name)) return FALSE;