1a3364b243b46f7cf3afe58688d6a8cc85e726cf kent Fri Jan 20 09:58:44 2017 -0800 Adding rowCount to fieldedTable and refactoring tagStormFromTab a bit. diff --git src/inc/fieldedTable.h src/inc/fieldedTable.h index b387136..a1be6e8 100644 --- src/inc/fieldedTable.h +++ src/inc/fieldedTable.h @@ -11,30 +11,31 @@ struct fieldedRow *next; char **row; // Array of strings int id; // In the file case this is the line of file row starts in }; struct fieldedTable /* A table with a name for each field. */ { struct fieldedTable *next; char *name; /* Often the file name */ struct lm *lm; /* All allocations done out of this memory pool. */ int fieldCount; /* Number of fields. */ char **fields; /* Names of fields. */ struct fieldedRow *rowList; /* list of parsed out fields. */ struct fieldedRow **cursor; /* Pointer to where we add next item to list. */ + int rowCount; /* Number of rows. */ }; struct fieldedTable *fieldedTableNew(char *name, char **fields, int fieldCount); /* Create a new empty fieldedTable with given name, often a file name. */ void fieldedTableFree(struct fieldedTable **pTable); /* Free up memory resources associated with table. */ struct fieldedRow *fieldedTableAdd(struct fieldedTable *table, char **row, int rowSize, int id); /* Create a new row and add it to table. Return row. */ struct fieldedTable *fieldedTableFromTabFile(char *fileName, char *url, char *requiredFields[], int requiredCount); /* Read table from tab-separated file with a #header line that defines the fields. Ensures * all requiredFields (if any) are present. The url is just used for error reporting and * should be the same as fileName for most purposes. This is used by edwSubmit though which