3bac9e69c474bacd569daee6b3a4d7c9a14166b0 kent Fri Aug 2 12:40:26 2019 -0700 Getting rid of some uglyf debugging messages and reducing verbosity. diff --git src/tabFile/tabToTabDir/tabToTabDir.c src/tabFile/tabToTabDir/tabToTabDir.c index 3196e40..bc6a4a2 100644 --- src/tabFile/tabToTabDir/tabToTabDir.c +++ src/tabFile/tabToTabDir/tabToTabDir.c @@ -79,67 +79,66 @@ void tabToTabDir(char *inTabFile, char *specFile, char *outDir) /* tabToTabDir - Convert a large tab-separated table to a directory full of such tables * according to a specification.. */ { struct fieldedTable *inTable = fieldedTableFromTabFile(inTabFile, inTabFile, NULL, 0); verbose(1, "Read %d columns, %d rows from %s\n", inTable->fieldCount, inTable->rowCount, inTabFile); struct lineFile *lf = lineFileOpen(specFile, TRUE); makeDirsOnPath(outDir); struct slPair *specStanza = NULL; while ((specStanza = raNextStanzAsPairs(lf)) != NULL) { /* Parse out table name and key field name. */ - verbose(1, "Processing spec stanza of %d lines\n", slCount(specStanza)); + verbose(2, "Processing spec stanza of %d lines\n", slCount(specStanza)); struct slPair *table = specStanza; char *tableName = table->name; char *keyFieldName = trimSpaces(table->val); if (isEmpty(keyFieldName)) errAbort("No key field for table %s.", tableName); /* Make sure that key field is actually in field list */ struct slPair *fieldList = table->next; int keyFieldIx = fieldedTableMustFindFieldIx(inTable, keyFieldName); if (keyFieldIx < 0) errAbort("key field %s is not found in field list for %s\n", tableName, keyFieldName); /* Create empty output table and track which fields of input go to output. */ int fieldCount = slCount(fieldList); - uglyf("Got %d fields\n", fieldCount); char *fieldNames[fieldCount]; int oldFieldIx[fieldCount]; int i; struct slPair *field; for (i=0, field=fieldList; i<fieldCount; ++i, field=field->next) { char *newName = trimSpaces(field->val); if (isEmpty(newName)) newName = field->name; fieldNames[i] = newName; oldFieldIx[i] = fieldedTableMustFindFieldIx(inTable, field->name); } struct fieldedTable *outTable = fieldedTableNew(tableName, fieldNames, fieldCount); outTable->startsSharp = inTable->startsSharp; /* Populate table */ selectUniqueIntoTable(inTable, keyFieldIx, oldFieldIx, outTable); /* Create output file name and save file. */ char outTabName[FILENAME_LEN]; safef(outTabName, sizeof(outTabName), "%s/%s.tsv", outDir, tableName); - uglyf("Saving table to %s\n", outTabName); + verbose(1, "Writing %s of %d fields %d rows\n", outTabName, outTable->fieldCount, outTable->rowCount); fieldedTableToTabFile(outTable, outTabName); } } int main(int argc, char *argv[]) /* Process command line. */ { optionInit(&argc, argv, options); if (argc != 4) usage(); tabToTabDir(argv[1], argv[2], argv[3]); return 0; }