85be21057a058a0bdb12caac2bae553376442f5a angie Mon Apr 15 10:56:28 2013 -0700 Refactoring to remove dependencies on annoGratorQuery from streamers,grators and formatters. Instead, provide basic assembly info and explicitly pass streamers(/grators) along with the rows that they produced into formatters. ref #6152 diff --git src/inc/annoGrator.h src/inc/annoGrator.h index b9eb030..d8b66cf 100644 --- src/inc/annoGrator.h +++ src/inc/annoGrator.h @@ -56,20 +56,17 @@ * If retRJFilterFailed is non-NULL: * - any overlapping row has a rightJoin filter failure (see annoFilter.h), or * - overlap rule is agoMustOverlap and no rows overlap, or * - overlap rule is agoMustNotOverlap and any overlapping row is found, * then set retRJFilterFailed and stop. */ void annoGratorInit(struct annoGrator *self, struct annoStreamer *mySource); /* Initialize an integrator of columns from mySource with (positions of) * rows passed to integrate(). * mySource becomes property of the annoGrator. */ struct annoGrator *annoGratorNew(struct annoStreamer *mySource); /* Make a new integrator of columns from mySource with (positions of) rows passed to integrate(). * mySource becomes property of the new annoGrator. */ -void annoGratorSetQuery(struct annoStreamer *vSelf, struct annoGratorQuery *query); -/* Set query (to be called only by annoGratorQuery which is created after streamers). */ - void annoGratorClose(struct annoStreamer **pSelf); /* Free self (including mySource). */