[X2serv-cvs] [CVS] Module x3: Change committed
Brought to you by:
sirvulcan
From: Alex S. <ru...@us...> - 2005-05-24 22:16:30
|
Committer : Alex Schumann <ru...@us...> CVSROOT : /cvsroot/x2serv Module : x3 Commit time: 2005-05-24 22:16:23 UTC Modified files: ChangeLog.X3 src/modcmd.c src/modcmd.help Log message: Fixing help to search all bound helpfiles for a topic. ---------------------- diff included ---------------------- Index: x3/ChangeLog.X3 diff -u x3/ChangeLog.X3:1.33 x3/ChangeLog.X3:1.34 --- x3/ChangeLog.X3:1.33 Wed May 18 11:37:33 2005 +++ x3/ChangeLog.X3 Tue May 24 15:16:12 2005 @@ -3,11 +3,23 @@ 2005-05-18 Alex Schumann <ru...@af...> + * src/modcmd.c: reed pointed out that modcmd non-command help wasnt + working, and pointed me to the opserv helpfiles command, which shows + what services search what help files. This fixes the help command to + search that list as it should. Still need to modify the 'default' + helpfile search bindigs because I dont think chanserv should respond + to help from opserv's db, etc. See opserv's 'helpfiles' command. + + * src/modcmd.help: clarified 'helpfiles' help. + +2005-05-18 Alex Schumann <ru...@af...> + * src/helpfile.c: make send_help() return true/false and not send errors so svccmd_send_help can 'take control' of things. * src/modcmd.c: Fixed up the help system (again) / find aliased - commands help if none exists. + commands help if none exists. / Display no help for that command on + commands (instead of topic) * src/modcmd.h: Fixed up the help system (again) @@ -217,5 +229,5 @@ ***********************************************************************/ -#define CVS_VERSION "$Revision: 1.33 $" +#define CVS_VERSION "$Revision: 1.34 $" Index: x3/src/modcmd.c diff -u x3/src/modcmd.c:1.17 x3/src/modcmd.c:1.18 --- x3/src/modcmd.c:1.17 Wed May 18 11:37:34 2005 +++ x3/src/modcmd.c Tue May 24 15:16:13 2005 @@ -57,6 +57,7 @@ { "MCMSG_COMMAND_ALIASES", "%s is an alias for: %s" }, { "MCMSG_HELP_COMMAND_ALIAS", "$uAlias for:$u %s" }, { "MCMSG_HELP_COMMAND_HEADER", "Command help for: $b%s$b" }, + { "MCMSG_HELP_COMMAND_UNKNOWN", "No help available for that command." }, { "MCMSG_HELP_TOPIC_HEADER", "Help topic: $b%s$b" }, { "MCMSG_HELP_DIVIDER", "=---------------------------------------=" }, { "MCMSG_HELP_FOOTER", "=------------- End of Help -------------=" }, @@ -788,7 +789,7 @@ struct module *module; struct svccmd *cmd; char cmdname[MAXLEN]; - unsigned int nn; + unsigned int nn, ii; int helpsent = 0; /* If there is no topic show the index */ @@ -825,24 +826,33 @@ } /* If send_help still couldnt find it, tell them sorry */ if(!helpsent) - send_message(user, service->bot, "MSG_TOPIC_UNKNOWN"); + send_message(user, service->bot, "MCMSG_HELP_COMMAND_UNKNOWN"); send_message(user, service->bot, "MCMSG_HELP_FOOTER"); return true; } else /* look for topic in the help files loaded to this nick/service */ { - /* Check for non command help in first primary help file, then - * check for help for this on another service and provide a tip */ - module = service->modules.list[0]; - if (module->helpfile && dict_find(module->helpfile->db, topic, NULL)) + /* Check for non command help in first primary help file, then next and so on */ + /* Note - we need to think about default bindings. see opserv.helpfiles */ + for(ii = 0; ii < service->modules.used; ii++) { - - send_message(user, service->bot, "MCMSG_HELP_TOPIC_HEADER", cmdname); - send_message(user, service->bot, "MCMSG_HELP_DIVIDER"); - if(!send_help(user, service->bot, module->helpfile, topic)) - send_message(user, service->bot, "MSG_TOPIC_UNKNOWN"); - send_message(user, service->bot, "MCMSG_HELP_FOOTER"); - return true; + module = service->modules.list[ii]; + if(!module->helpfile) + continue; + if(dict_find(module->helpfile->db, topic, NULL)) + { + if (module->helpfile && dict_find(module->helpfile->db, topic, NULL)) + { + + send_message(user, service->bot, "MCMSG_HELP_TOPIC_HEADER", cmdname); + send_message(user, service->bot, "MCMSG_HELP_DIVIDER"); + /* This should never fail but maybe if something is odd? */ + if(!send_help(user, service->bot, module->helpfile, topic)) + send_message(user, service->bot, "MSG_TOPIC_UNKNOWN"); + send_message(user, service->bot, "MCMSG_HELP_FOOTER"); + return true; + } + } } } /* Otherwise say we cant find it */ Index: x3/src/modcmd.help diff -u x3/src/modcmd.help:1.5 x3/src/modcmd.help:1.6 --- x3/src/modcmd.help:1.5 Thu May 5 17:30:51 2005 +++ x3/src/modcmd.help Tue May 24 15:16:13 2005 @@ -116,7 +116,7 @@ "helpfiles" ("/msg $S HELPFILES <service> [module list]", "With only a service nick, shows the helpfiles used by that service.", - "With a list of modules, sets the order that the service will look up non-command help entries.", + "Give a list of modules (seperated by spaces), to set the order that the service will look up non-command help entries.", "$uSee Also:$u bind, unbind"); "service add" ("/msg $S SERVICE ADD <nick> <hostname> <description>", ----------------------- End of diff ----------------------- |