Add RAWIO log level which is more verbose than DEBUG

[user/henk/code/inspircd.git] / src / modules / m_regex_glob.cpp

diff --git a/src/modules/m_regex_glob.cpp b/src/modules/m_regex_glob.cpp
index a3923205f9321771683372beb739d9282dc79759..57f15f731e9bf39cd8cf0f526dded98de00270dc 100644 (file)
--- a/src/modules/m_regex_glob.cpp
+++ b/src/modules/m_regex_glob.cpp
@@ -2,7 +2,7 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ *  InspIRCd: (C) 2002-2010 InspIRCd Development Team
  * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
@@ -33,35 +33,28 @@ public:
        }
 };
 
-class ModuleRegexGlob : public Module
+class GlobFactory : public RegexFactory
 {
-public:
-       ModuleRegexGlob()       {
-               ServerInstance->Modules->PublishInterface("RegularExpression", this);
-       }
-
-       virtual Version GetVersion()
+ public:
+       Regex* Create(const std::string& expr)
        {
-               return Version("Regex module using plain wildcard matching.", VF_OPTCOMMON | VF_VENDOR | VF_SERVICEPROVIDER);
+               return new GlobRegex(expr);
        }
 
-       virtual ~ModuleRegexGlob()
-       {
-               ServerInstance->Modules->UnpublishInterface("RegularExpression", this);
+       GlobFactory(Module* m) : RegexFactory(m, "regex/glob") {}
+};
+
+class ModuleRegexGlob : public Module
+{
+       GlobFactory gf;
+public:
+       ModuleRegexGlob() : gf(this) {
+               ServerInstance->Modules->AddService(gf);
        }
 
-       void OnRequest(Request& request)
+       Version GetVersion()
        {
-               if (strcmp("REGEX-NAME", request.id) == 0)
-               {
-                       static_cast<RegexNameRequest&>(request).result = "glob";
-               }
-               else if (strcmp("REGEX", request.id) == 0)
-               {
-                       RegexFactoryRequest& rfr = (RegexFactoryRequest&)request;
-                       std::string rx = rfr.GetRegex();
-                       rfr.result = new GlobRegex(rx);
-               }
+               return Version("Regex module using plain wildcard matching.", VF_VENDOR);
        }
 };