ff74889ad772c653a5a127e1c8a340870b17e3b1 braney Thu Mar 24 17:33:01 2016 -0700 fix up hgFind issues with genbank meta tables #16809 diff --git src/hg/checkHgFindSpec/checkHgFindSpec.c src/hg/checkHgFindSpec/checkHgFindSpec.c index a048545..b45f509 100644 --- src/hg/checkHgFindSpec/checkHgFindSpec.c +++ src/hg/checkHgFindSpec/checkHgFindSpec.c @@ -3,30 +3,31 @@ /* Copyright (C) 2013 The Regents of the University of California * See README in this or parent directory for licensing information. */ #include "common.h" #include "options.h" #include "jksql.h" #include "hash.h" #include "dystring.h" #include "portable.h" #include "hdb.h" #include "hui.h" #include "cheapcgi.h" #include "cart.h" #include "hgFind.h" #include "hgFindSpec.h" #include "regexHelper.h" +#include "genbank.h" char *database = NULL; /* Need to get a cart in order to use hgFind. */ struct cart *cart = NULL; /* Command line option specifications */ static struct optionSpec optionSpecs[] = { {"showSearches", OPTION_BOOLEAN}, {"checkTermRegex", OPTION_BOOLEAN}, {"exampleFor", OPTION_STRING}, {"checkIndexes", OPTION_BOOLEAN}, {"makeExamples", OPTION_BOOLEAN}, {NULL, 0} }; @@ -345,30 +346,31 @@ errAbort("Sorry, -makeExamples not implemented yet."); return(gotError); } int checkHgFindSpec(char *db, char *termToSearch, boolean showSearches, boolean checkTermRegex, char *exampleFor, boolean checkIndexes, boolean makeExamples) /* Perform searches/checks as specified, summarize errors, * return nonzero if there are errors. */ { boolean gotError = FALSE; database = db; +initGenbankTableNames("gbMeta"); if (isNotEmpty(termToSearch)) gotError |= reportSearch(termToSearch); if (showSearches) gotError |= reportSearch(NULL); if (checkTermRegex) gotError |= doCheckTermRegex(); if (isNotEmpty(exampleFor)) { termToSearch = getExampleFor(exampleFor); gotError |= reportSearch(termToSearch); } if (checkIndexes) gotError |= doCheckIndexes(); if (makeExamples)