b3fcbb7d6139a1993f5f02261ae3b495bc3edf41 angie Mon Aug 15 10:43:26 2016 -0700 Increased verbosity level to 2 for no match & no table info lines. diff --git src/hg/checkHgFindSpec/checkHgFindSpec.c src/hg/checkHgFindSpec/checkHgFindSpec.c index b45f509..3be9932 100644 --- src/hg/checkHgFindSpec/checkHgFindSpec.c +++ src/hg/checkHgFindSpec/checkHgFindSpec.c @@ -80,65 +80,65 @@ startMs = clock1000(); for (hfs = shortList; hfs != NULL; hfs = hfs->next) { boolean matches = TRUE; boolean tablesExist = hTableOrSplitExists(database, hfs->searchTable); if (isNotEmpty(termToSearch) && isNotEmpty(hfs->termRegex)) matches = regexMatchNoCase(termToSearch, hfs->termRegex); if (isNotEmpty(hfs->xrefTable)) tablesExist |= hTableExists(database, hfs->xrefTable); if (matches && tablesExist) { verbose(1, "SHORT-CIRCUIT %s\n", hfs->searchName); } else if (matches) { - verbose(1, "no table %s: %s%s%s\n", hfs->searchName, hfs->searchTable, + verbose(2, "no table %s: %s%s%s\n", hfs->searchName, hfs->searchTable, isNotEmpty(hfs->xrefTable) ? " and/or " : "", isNotEmpty(hfs->xrefTable) ? hfs->xrefTable : ""); } else { - verbose(1, "no match %s: %s\n", hfs->searchName, hfs->termRegex); + verbose(2, "no match %s: %s\n", hfs->searchName, hfs->termRegex); } } endMs = clock1000(); printf("\nTook %dms to determine short-circuit searches.\n\n", endMs - startMs); startMs = clock1000(); for (hfs = longList; hfs != NULL; hfs = hfs->next) { boolean matches = TRUE; boolean tablesExist = hTableOrSplitExists(database, hfs->searchTable); if (isNotEmpty(termToSearch) && isNotEmpty(hfs->termRegex)) matches = regexMatchNoCase(termToSearch, hfs->termRegex); if (isNotEmpty(hfs->xrefTable)) tablesExist |= hTableExists(database, hfs->xrefTable); if (matches && tablesExist) { verbose(1, "ADDITIVE %s\n", hfs->searchName); } else if (matches) { - verbose(1, "no table %s: %s%s%s\n", hfs->searchName, hfs->searchTable, + verbose(2, "no table %s: %s%s%s\n", hfs->searchName, hfs->searchTable, isNotEmpty(hfs->xrefTable) ? " and/or " : "", isNotEmpty(hfs->xrefTable) ? hfs->xrefTable : ""); } else { - verbose(1, "no match %s: %s\n", hfs->searchName, hfs->termRegex); + verbose(2, "no match %s: %s\n", hfs->searchName, hfs->termRegex); } } endMs = clock1000(); printf("\nTook %dms to determine multiple/additive searches.\n" "(These won't happen if it short-circuits.)\n\n", endMs - startMs); if (isNotEmpty(termToSearch)) { startMs = clock1000(); hgp = findGenomePos(database, termToSearch, &chrom, &chromStart, &chromEnd, cart); endMs = clock1000(); if (hgp != NULL && hgp->singlePos != NULL) { struct hgPos *pos = hgp->singlePos;