#include "../lib/strlfunc.h"
#include "../lib/array.h"
#include "newsearch.h"
+#include "parser.h"
MODULE_VERSION("");
searchCmd *reg_nicksearch, *reg_chansearch, *reg_usersearch;
void displaycommandhelp(nick *, Command *);
+void displaystrerror(replyFunc, nick *, const char *);
searchCmd *registersearchcommand(char *name, int level, CommandHandler cmd, void *defaultdisplayfunc) {
searchCmd *acmd;
addcommandtotree(searchCmdTree, name, 0, 0, (CommandHandler)acmd);
for (sl=globalterms; sl; sl=sl->next) {
- registersearchterm( acmd, sl->name->content, sl->cmd, 0, sl->help);
+ addcommandexttotree(acmd->searchtree, sl->name->content, 0, 1, (CommandHandler)sl->cmd, sl->help);
}
return acmd;
deregistercontrolcmd(scmd->name->content, (CommandHandler)scmd->handler);
destroycommandtree(scmd->outputtree);
destroycommandtree(scmd->searchtree);
+ deletecommandfromtree(searchCmdTree, scmd->name->content, (CommandHandler) scmd);
freesstring(scmd->name);
free(scmd);
}
}
controlreply(np, " \n");
- controlreply(np, "Available Global Search Terms:\n" );
+ controlreply(np, "Available Global Commands and Operators:\n" );
m=getcommandlist(acmd->searchtree,acmdlist,100);
for(j=0;j<m;j++) {
if ( acmdlist[j]->maxparams) {
}
controlreply(np, " \n");
- controlreply(np, "Available Search Terms for %s:\n", acmd->name->content);
+ controlreply(np, "Available Commands and Operators for %s:\n", acmd->name->content);
m=getcommandlist(acmd->searchtree,acmdlist,100);
for(j=0;j<m;j++) {
registerglobalsearchterm("length",length_parse, "usage: (length string)");
/* Nickname operations */
- registersearchterm(reg_nicksearch, "hostmask",hostmask_parse, 0, "Users host mask, allow \"hostmask real\" to match realhost"); /* nick only */
- registersearchterm(reg_nicksearch, "realname",realname_parse, 0, "Users current realname"); /* nick only */
- registersearchterm(reg_nicksearch, "authname",authname_parse, 0, "Users current authname or false"); /* nick only */
- registersearchterm(reg_nicksearch, "authts",authts_parse, 0, "Users Auth timestamp"); /* nick only */
- registersearchterm(reg_nicksearch, "ident",ident_parse, 0, "Users current ident"); /* nick only */
- registersearchterm(reg_nicksearch, "host",host_parse, 0, "Users host, allow \"host real\" to match real host"); /* nick only */
+ registersearchterm(reg_nicksearch, "hostmask",hostmask_parse, 0, "The user's nick!user@host; \"hostmask real\" returns nick!user@host\rreal"); /* nick only */
+ registersearchterm(reg_nicksearch, "realname",realname_parse, 0, "User's current realname"); /* nick only */
+ registersearchterm(reg_nicksearch, "authname",authname_parse, 0, "User's current authname or false"); /* nick only */
+ registersearchterm(reg_nicksearch, "authts",authts_parse, 0, "User's Auth timestamp"); /* nick only */
+ registersearchterm(reg_nicksearch, "ident",ident_parse, 0, "User's current ident"); /* nick only */
+ registersearchterm(reg_nicksearch, "host",host_parse, 0, "User's host, allow \"host real\" to match real host"); /* nick only */
registersearchterm(reg_nicksearch, "channel",channel_parse, 0, "Valid Channel Name to match users against"); /* nick only */
- registersearchterm(reg_nicksearch, "timestamp",timestamp_parse, 0, "Users Timestamp"); /* nick only */
+ registersearchterm(reg_nicksearch, "timestamp",timestamp_parse, 0, "User's Timestamp"); /* nick only */
registersearchterm(reg_nicksearch, "country",country_parse, 0, "2 letter country code (data source is geoip)"); /* nick only */
- registersearchterm(reg_nicksearch, "ip",ip_parse, 0, "Users IP - ipv4 or ipv6 format as appropriate. Note: not 6to4"); /* nick only */
+ registersearchterm(reg_nicksearch, "ip",ip_parse, 0, "User's IP - ipv4 or ipv6 format as appropriate. Note: not 6to4"); /* nick only */
registersearchterm(reg_nicksearch, "channels",channels_parse, 0, "Channel Count"); /* nick only */
registersearchterm(reg_nicksearch, "server",server_parse, 0, "Server Name. Either (server string) or (match (server) string)"); /* nick only */
- registersearchterm(reg_nicksearch, "authid",authid_parse, 0, "Users Auth ID"); /* nick only */
+ registersearchterm(reg_nicksearch, "authid",authid_parse, 0, "User's Auth ID"); /* nick only */
registersearchterm(reg_nicksearch, "cidr",cidr_parse, 0, "CIDR matching"); /* nick only */
+ registersearchterm(reg_nicksearch, "ipvsix",ipv6_parse, 0, "IPv6 user"); /* nick only */
/* Channel operations */
registersearchterm(reg_chansearch, "exists",exists_parse, 0, "Returns if channel exists on network. Note: newserv may store data on empty channels"); /* channel only */
registersearchterm(reg_chansearch, "name",name_parse, 0, "Channel Name"); /* channel only */
registersearchterm(reg_chansearch, "topic",topic_parse, 0, "Channel topic"); /* channel only */
registersearchterm(reg_chansearch, "oppct",oppct_parse, 0, "Percentage Opped"); /* channel only */
+ registersearchterm(reg_chansearch, "cumodecount",cumodecount_parse, 0, "Count of users with given channel modes"); /* channel only */
+ registersearchterm(reg_chansearch, "cumodepct",cumodepct_parse, 0, "Percentage of users with given channel modes"); /* channel only */
registersearchterm(reg_chansearch, "uniquehostpct",hostpct_parse, 0, "uniquehost percent"); /* channel only */
registersearchterm(reg_chansearch, "authedpct",authedpct_parse, 0, "Percentage of authed users"); /* channel only */
registersearchterm(reg_chansearch, "kick",kick_parse, 0, "KICK users channels in newsearch result. Note: evaluation order"); /* channel only */
/* Iterable functions */
registersearchterm(reg_nicksearch, "channeliter",channeliter_parse, 0, "Channel Iterable function - usage: (any (channeliter x) (match (var x) #twilight*))"); /* nick only */
+ registersearchterm(reg_chansearch, "nickiter",nickiter_parse, 0, "Nick Iterable function - usage: (any (nickiter x) (match (var x) nickname*))"); /* channel only */
/* Functions that work on strings?! */
registersearchterm(reg_nicksearch, "cumodes", cumodes_parse, 0, "usage: (cumodes (var x) <modes>)");
+ registersearchterm(reg_chansearch, "cumodes", cumodes_parse, 0, "usage: (cumodes (var x) <modes>)");
/* Notice functionality */
registersearchterm(reg_chansearch,"notice",notice_parse, 0, "NOTICE users in newsearch result. Note: evaluation order");
break;
case 's':
+ if (subset == NULL) {
+ reply(sender,"Error: -s switch not supported for this search.");
+ return CMD_ERROR;
+ }
if (cargc<*arg) {
reply(sender,"Error: -s switch requires an argument (for help, see help <searchcmd>)");
return CMD_ERROR;
return CMD_OK;
}
-void newsearch_ctxinit(searchCtx *ctx, searchParseFunc searchfn, replyFunc replyfn, wallFunc wallfn, void *arg, searchCmd *cmd, nick *np) {
+void newsearch_ctxinit(searchCtx *ctx, searchParseFunc searchfn, replyFunc replyfn, wallFunc wallfn, void *arg, searchCmd *cmd, nick *np, void *displayfn, int limit) {
memset(ctx, 0, sizeof(searchCtx));
ctx->reply = replyfn;
ctx->arg = arg;
ctx->searchcmd = cmd;
ctx->sender = np;
+ ctx->limit = limit;
+ ctx->displayfn = displayfn;
}
int do_nicksearch_real(replyFunc reply, wallFunc wall, void *source, int cargc, char **cargv) {
nick *sender = source;
- struct searchNode *search;
int limit=500;
int arg=0;
NickDisplayFunc display=defaultnickfn;
- searchCtx ctx;
int ret;
+#ifndef NEWSEARCH_NEWPARSER
+ searchCtx ctx;
+ struct searchNode *search;
+#else
+ parsertree *tree;
+#endif
if (cargc<1) {
reply( sender, "Usage: [flags] <criteria>");
rejoinline(cargv[arg],cargc-arg);
}
- newsearch_ctxinit(&ctx, search_parse, reply, wall, NULL, reg_nicksearch, sender);
-
+#ifndef NEWSEARCH_NEWPARSER
+ newsearch_ctxinit(&ctx, search_parse, reply, wall, NULL, reg_nicksearch, sender, display, limit);
if (!(search = ctx.parser(&ctx, cargv[arg]))) {
reply(sender,"Parse error: %s",parseError);
return CMD_ERROR;
}
- nicksearch_exe(search, &ctx, sender, display, limit);
+ nicksearch_exe(search, &ctx);
(search->free)(&ctx, search);
+#else
+ tree = parse_string(reg_nicksearch, cargv[arg]);
+ if(!tree) {
+ displaystrerror(reply, sender, cargv[arg]);
+ return CMD_ERROR;
+ }
+
+ ast_nicksearch(tree->root, reply, sender, wall, display, NULL, NULL, limit);
+
+ parse_free(tree);
+#endif
return CMD_OK;
}
return do_nicksearch_real(controlreply, controlwallwrapper, source, cargc, cargv);
}
-void nicksearch_exe(struct searchNode *search, searchCtx *ctx, nick *sender, NickDisplayFunc display, int limit) {
+void nicksearch_exe(struct searchNode *search, searchCtx *ctx) {
int i, j;
int matches = 0;
unsigned int cmarker;
unsigned int tchans=0,uchans=0;
struct channel **cs;
- nick *np;
+ nick *np, *sender = ctx->sender;
senderNSExtern = sender;
-
+ NickDisplayFunc display = ctx->displayfn;
+ int limit = ctx->limit;
+
/* Get a marker value to mark "seen" channels for unique count */
cmarker=nextchanmarker();
int do_chansearch_real(replyFunc reply, wallFunc wall, void *source, int cargc, char **cargv) {
nick *sender = source;
- struct searchNode *search;
int limit=500;
int arg=0;
ChanDisplayFunc display=defaultchanfn;
- searchCtx ctx;
int ret;
+#ifndef NEWSEARCH_NEWPARSER
+ struct searchNode *search;
+ searchCtx ctx;
+#else
+ parsertree *tree;
+#endif
if (cargc<1) {
reply( sender, "Usage: [flags] <criteria>");
rejoinline(cargv[arg],cargc-arg);
}
- newsearch_ctxinit(&ctx, search_parse, reply, wall, NULL, reg_chansearch, sender);
+#ifndef NEWSEARCH_NEWPARSER
+ newsearch_ctxinit(&ctx, search_parse, reply, wall, NULL, reg_chansearch, sender, display, limit);
if (!(search = ctx.parser(&ctx, cargv[arg]))) {
reply(sender,"Parse error: %s",parseError);
return CMD_ERROR;
}
- chansearch_exe(search, &ctx, sender, display, limit);
+ chansearch_exe(search, &ctx);
(search->free)(&ctx, search);
+#else
+ tree = parse_string(reg_chansearch, cargv[arg]);
+ if(!tree) {
+ displaystrerror(reply, sender, cargv[arg]);
+ return CMD_ERROR;
+ }
+
+ ast_chansearch(tree->root, reply, sender, wall, display, NULL, NULL, limit);
+
+ parse_free(tree);
+#endif
return CMD_OK;
}
return do_chansearch_real(controlreply, controlwallwrapper, source, cargc, cargv);
}
-void chansearch_exe(struct searchNode *search, searchCtx *ctx, nick *sender, ChanDisplayFunc display, int limit) {
+void chansearch_exe(struct searchNode *search, searchCtx *ctx) {
int i;
chanindex *cip;
int matches = 0;
+ nick *sender = ctx->sender;
senderNSExtern = sender;
+ ChanDisplayFunc display = ctx->displayfn;
+ int limit = ctx->limit;
search=coerceNode(ctx, search, RETURNTYPE_BOOL);
int do_usersearch_real(replyFunc reply, wallFunc wall, void *source, int cargc, char **cargv) {
nick *sender = source;
- struct searchNode *search;
int limit=500;
int arg=0;
UserDisplayFunc display=defaultuserfn;
- searchCtx ctx;
int ret;
+#ifndef NEWSEARCH_NEWPARSER
+ struct searchNode *search;
+ searchCtx ctx;
+#else
+ parsertree *tree;
+#endif
if (cargc<1) {
reply( sender, "Usage: [flags] <criteria>");
rejoinline(cargv[arg],cargc-arg);
}
- newsearch_ctxinit(&ctx, search_parse, reply, wall, NULL, reg_usersearch, sender);
+#ifndef NEWSEARCH_NEWPARSER
+ newsearch_ctxinit(&ctx, search_parse, reply, wall, NULL, reg_usersearch, sender, display, limit);
if (!(search = ctx.parser(&ctx, cargv[arg]))) {
reply(sender,"Parse error: %s",parseError);
return CMD_ERROR;
}
- usersearch_exe(search, &ctx, sender, display, limit);
+ usersearch_exe(search, &ctx);
(search->free)(&ctx, search);
+#else
+ tree = parse_string(reg_usersearch, cargv[arg]);
+ if(!tree) {
+ displaystrerror(reply, sender, cargv[arg]);
+ return CMD_ERROR;
+ }
+
+ ast_usersearch(tree->root, reply, sender, wall, display, NULL, NULL, limit);
+
+ parse_free(tree);
+#endif
return CMD_OK;
}
return do_usersearch_real(controlreply, controlwallwrapper, source, cargc, cargv);
}
-void usersearch_exe(struct searchNode *search, searchCtx *ctx, nick *sender, UserDisplayFunc display, int limit) {
+void usersearch_exe(struct searchNode *search, searchCtx *ctx) {
int i;
authname *aup;
int matches = 0;
+ nick *sender = ctx->sender;
+ int limit = ctx->limit;
+ UserDisplayFunc display = ctx->displayfn;
senderNSExtern = sender;
-
+
search=coerceNode(ctx, search, RETURNTYPE_BOOL);
for (i=0;i<AUTHNAMEHASHSIZE;i++) {
return 1;
}
-/* search_parse:
- * Given an input string, return a searchNode.
- */
-
struct searchNode *search_parse(searchCtx *ctx, char *cinput) {
/* OK, we need to split the input into chunks on spaces and brackets.. */
char *argvector[100];
char inputb[1024];
char *input;
char thestring[500];
- int i,j,q=0,e=0,k;
+ int i,j,q=0,e=0;
char *ch;
struct Command *cmd;
struct searchNode *thenode;
void var_setstr(struct searchVariable *v, char *data) {
v->cdata.u.stringbuf = data;
}
+
+#ifdef NEWSEARCH_NEWPARSER
+void displaystrerror(replyFunc reply, nick *np, const char *input) {
+ char buf[515];
+
+ if((parseStrErrorPos >= 0) && (parseStrErrorPos < sizeof(buf) - 3)) {
+ int i;
+
+ for(i=0;i<parseStrErrorPos;i++)
+ buf[i] = ' ';
+
+ buf[i++] = '^';
+ buf[i] = '\0';
+
+ reply(np, "%s", input);
+ reply(np, "%s", buf);
+ }
+
+ reply(np, "Parse error: %s", parseStrError);
+}
+#endif
+
+struct searchNode *argtoconststr(char *command, searchCtx *ctx, char *arg, char **p) {
+ struct searchNode *c;
+ static char errorbuf[512];
+
+ c = ctx->parser(ctx, arg);
+ if (!(c = coerceNode(ctx, c, RETURNTYPE_STRING))) {
+ snprintf(errorbuf, sizeof(errorbuf), "%s: unable to coerce argument to string", command);
+ parseError = errorbuf;
+ return NULL;
+ }
+
+ if (!(c->returntype & RETURNTYPE_CONST)) {
+ snprintf(errorbuf, sizeof(errorbuf), "%s: constant argument required", command);
+ parseError = errorbuf;
+ (c->free)(ctx, c);
+ return NULL;
+ }
+
+ if(p)
+ *p = (char *)(c->exe)(ctx, c, NULL);
+
+ return c;
+}
projects / irc / quakenet / newserv.git / blobdiff