15d0836b4dba65919e83ce5ef0aaafe5a0edc72f angie Wed Apr 17 12:49:53 2013 -0700 Making annoGratorGpVar able to handle VCF input too. In order for a grator tosee what type of input is coming from the primary source, the streamer should be passed in along with the primary row, as it is for formatters now. refs #6152 diff --git src/lib/annoFormatter.c src/lib/annoFormatter.c index ae8b3b6..34525bf 100644 --- src/lib/annoFormatter.c +++ src/lib/annoFormatter.c @@ -1,39 +1,26 @@ /* annoFormatter -- aggregates, formats and writes output from multiple sources */ #include "annoFormatter.h" struct annoOption *annoFormatterGetOptions(struct annoFormatter *self) /* Return supported options and current settings. Callers can modify and free when done. */ { return annoOptionCloneList(self->options); } void annoFormatterSetOptions(struct annoFormatter *self, struct annoOption *newOptions) /* Free old options and use clone of newOptions. */ { annoOptionFreeList(&(self->options)); self->options = annoOptionCloneList(newOptions); } void annoFormatterFree(struct annoFormatter **pSelf) /* Free self. This should be called at the end of subclass close methods, after * subclass-specific connections are closed and resources are freed. */ { if (pSelf == NULL) return; annoOptionFreeList(&((*pSelf)->options)); freez(pSelf); } - -struct annoStreamRows *annoStreamRowsNew(struct annoStreamer *streamerList) -/* Return an array of aS&R for each streamer in streamerList. */ -{ -int streamerCount = slCount(streamerList); -struct annoStreamRows *data = NULL; -AllocArray(data, streamerCount); -struct annoStreamer *streamer = streamerList; -int i = 0; -for (; i < streamerCount; i++, streamer = streamer->next) - data[i].streamer = streamer; -return data; -}