e92495a7ffb311c5b7b4dd8d9520bac66e25dfc0
angie
  Thu Jan 24 11:45:39 2013 -0800
Feature #6152 (Variant Annotation Integrator): remove an asObj tweak that was causing pgSnp load problem in annoGratorGpVar.Also get the trackDb for the selected subtrack, which is not the behavior of trackDbForTrack -- it returns composite tdb.
Implement "mustOverlap" grator behavior.

diff --git src/lib/annoGrator.c src/lib/annoGrator.c
index 7a103b9..5a19528 100644
--- src/lib/annoGrator.c
+++ src/lib/annoGrator.c
@@ -121,31 +121,31 @@
     if (qRow->start < primaryRow->end && qRow->end > primaryRow->start &&
 	sameString(qRow->chrom, primaryRow->chrom))
 	{
 	slAddHead(&rowList, annoRowClone(qRow, self->mySource));
 	if (rjFailHard && qRow->rightJoinFail)
 	    {
 	    *retRJFilterFailed = TRUE;
 	    break;
 	    }
 	}
     }
 slReverse(&rowList);
 // If no rows overlapped primary, and there is a right-join, !isExclude (i.e. isInclude) filter,
 // then we need to set retRJFilterFailed because the condition was not met to include
 // the primary item.
-if (rowList == NULL && rjFailHard && self->haveRJIncludeFilter)
+if (rowList == NULL && self->haveRJIncludeFilter)
     *retRJFilterFailed = TRUE;
 return rowList;
 }
 
 void annoGratorClose(struct annoStreamer **pSelf)
 /* Free self (including mySource). */
 {
 if (pSelf == NULL)
     return;
 struct annoGrator *self = *(struct annoGrator **)pSelf;
 annoRowFreeList(&(self->qHead), self->mySource);
 self->mySource->close(&(self->mySource));
 freeMem(self->prevPChrom);
 freez(pSelf);
 }