LUA: port luadb to dbapi2 to drop postgres dependency

[irc/quakenet/newserv.git] / newsearch / ns-all.c

diff --git a/newsearch/ns-all.c b/newsearch/ns-all.c
index f8b9df3a20dfc7e933077a5013be392e4132e9bd..3206d9aca591de4a4cbc6a958fcd34acca647e62 100644 (file)
--- a/newsearch/ns-all.c
+++ b/newsearch/ns-all.c
@@ -66,7 +66,7 @@ void all_free(searchCtx *ctx, struct searchNode *thenode) {
   struct all_localdata *localdata = thenode->localdata;
   
   if(localdata->hitlimit)
-    ctx->reply(senderNSExtern, "Warning: your expression hit the maximum iteration count and was terminated early.");
+    ctx->reply(senderNSExtern, "Warning: your expression was terminated for %d nicks as it hit the maximum iteration count.", localdata->hitlimit);
   
   (localdata->genfn->free)(ctx, localdata->genfn);
   (localdata->lambdafn->free)(ctx, localdata->lambdafn);
@@ -79,8 +79,9 @@ void *all_exe(searchCtx *ctx, struct searchNode *thenode, void *theinput) {
   struct all_localdata *localdata = thenode->localdata;
   int i;
 
-  if(localdata->hitlimit)
+/*  if(localdata->hitlimit)
     return (void *)0;
+*/
 
   for(i=0;i<MAX_ITERATIONS;i++) {
     if(!(localdata->genfn->exe)(ctx, localdata->genfn, theinput))
@@ -90,6 +91,6 @@ void *all_exe(searchCtx *ctx, struct searchNode *thenode, void *theinput) {
       return (void *)0;
   }
   
-  localdata->hitlimit = 1;
+  localdata->hitlimit++;
   return (void *)0;
 }