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/lib/annoFormatTab.c src/lib/annoFormatTab.c index 3bfc87d..70db700 100644 --- src/lib/annoFormatTab.c +++ src/lib/annoFormatTab.c @@ -91,31 +91,31 @@ dyStringPrintf(dy, "%g,", vector[i]); char **words; AllocArray(words, 1); words[0] = dyStringCannibalize(&dy); return words; } static char **wordsFromRow(struct annoRow *row, struct annoStreamer *source, boolean *retFreeWhenDone) /* If source->rowType is arWords, return its words. Otherwise translate row->data into words. */ { if (row == NULL) return NULL; boolean freeWhenDone = FALSE; char **words = NULL; -if (source->rowType == arWords || source->rowType == arVcf) +if (source->rowType == arWords) words = row->data; else if (source->rowType == arWig) { freeWhenDone = TRUE; //#*** config options: avg? more stats? list of values? boolean doAvg = FALSE; if (doAvg) words = wordsFromWigRowAvg(row); else words = wordsFromWigRowVals(row); } else errAbort("annoFormatTab: unrecognized row type %d from source %s", source->rowType, source->name); if (retFreeWhenDone != NULL)