1359d9856e982d83be761f3501bd6a87c046dee6 angie Mon Apr 15 15:56:56 2013 -0700 Added determination of data type by asObject comparison instead ofkludges like special annoRowType or checking a few column names. refs #6152 diff --git src/inc/annoRow.h src/inc/annoRow.h index 3782c29..9c94b1f 100644 --- src/inc/annoRow.h +++ src/inc/annoRow.h @@ -1,24 +1,24 @@ /* annoRow -- basic data interchange unit of annoGratorQuery framework. */ #ifndef ANNOROW_H #define ANNOROW_H #include "common.h" #include "localmem.h" -enum annoRowType { arUnknown, arWords, arWig, arVcf }; +enum annoRowType { arUnknown, arWords, arWig }; struct annoRow /* Representation of a row from a database table or file. The chrom, start and end * facilitate intersection by position. If type is arWords, then data is an array * of strings corresponding to columns in the autoSql definition provided by the * source of the annoRow. If type is arWig, then data is an array of floats. * rightJoinFail is true if this row failed a filter marked as rightJoin, meaning it * can knock out the primary row (see annoFilter.h). */ { struct annoRow *next; char *chrom; uint start; uint end; void *data; boolean rightJoinFail;