src/utils/raSqlQuery/raSqlQuery.c 1.26

1.26 2009/12/03 20:05:39 kent
Adding lm parameter to rqlEvalOnRecord since array operation uses memory.
Index: src/utils/raSqlQuery/raSqlQuery.c
===================================================================
RCS file: /projects/compbio/cvsroot/kent/src/utils/raSqlQuery/raSqlQuery.c,v
retrieving revision 1.25
retrieving revision 1.26
diff -b -B -U 4 -r1.25 -r1.26
--- src/utils/raSqlQuery/raSqlQuery.c	2 Dec 2009 19:11:54 -0000	1.25
+++ src/utils/raSqlQuery/raSqlQuery.c	3 Dec 2009 20:05:39 -0000	1.26
@@ -290,9 +290,9 @@
 else
     return field->val;
 }
 
-boolean rqlStatementMatch(struct rqlStatement *rql, struct raRecord *ra)
+boolean rqlStatementMatch(struct rqlStatement *rql, struct raRecord *ra, struct lm *lm)
 /* Return TRUE if where clause and tableList in statement evaluates true for ra. */
 {
 if (rql->tableList != NULL)
     {
@@ -319,9 +319,9 @@
 if (whereClause == NULL)
     return TRUE;
 else
     {
-    struct rqlEval res = rqlEvalOnRecord(whereClause, ra, lookupField);
+    struct rqlEval res = rqlEvalOnRecord(whereClause, ra, lookupField, lm);
     res = rqlEvalCoerceToBoolean(res);
     return res.val.b;
     }
 }
@@ -516,9 +516,9 @@
 int matchCount = 0;
 boolean doSelect = sameString(rql->command, "select");
 for (ra = raList; ra != NULL; ra = ra->next)
     {
-    if (rqlStatementMatch(rql, ra))
+    if (rqlStatementMatch(rql, ra, lm))
         {
 	if (!clStrict || (ra->key && hTableOrSplitExists(db, ra->key)))
 	    {
 	    matchCount += 1;