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/annoGratorQuery.c src/lib/annoGratorQuery.c
index 2d783bf..b3a2ba5 100644
--- src/lib/annoGratorQuery.c
+++ src/lib/annoGratorQuery.c
@@ -75,31 +75,31 @@
     gratorData = annoStreamRowsNew(gratorStreamList);
     }
 struct annoRow *primaryRow = NULL;
 struct lm *lm = lmInit(0);
 while ((primaryRow = primarySrc->nextRow(primarySrc, lm)) != NULL)
     {
     if (primaryRow->rightJoinFail)
 	continue;
     primaryData->rowList = primaryRow;
     boolean rjFilterFailed = FALSE;
     int i;
     for (i = 0;  i < gratorCount;  i++)
 	{
 
 	struct annoGrator *grator = (struct annoGrator *)gratorData[i].streamer;
-	gratorData[i].rowList = grator->integrate(grator, primaryRow, &rjFilterFailed, lm);
+	gratorData[i].rowList = grator->integrate(grator, primaryData, &rjFilterFailed, lm);
 	if (rjFilterFailed)
 	    break;
 	}
     struct annoFormatter *formatter = NULL;
     for (formatter = query->formatters;  formatter != NULL;  formatter = formatter->next)
 	if (!rjFilterFailed)
 	    formatter->formatOne(formatter, primaryData, gratorData, gratorCount);
     lmCleanup(&lm);
     lm = lmInit(0);
     }
 freez(&primaryData);
 freez(&gratorData);
 lmCleanup(&lm);
 }