Make a ./configure --system to support system-wide installation of inspircd

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

diff --git a/src/modules/extra/m_pgsql.cpp b/src/modules/extra/m_pgsql.cpp
index c0b2bbac852516dac9c4d70fd237fcf623186828..629193ea1613e1b845ae074822bd45c8a39816a7 100644 (file)
--- a/src/modules/extra/m_pgsql.cpp
+++ b/src/modules/extra/m_pgsql.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
@@ -44,7 +44,7 @@ typedef std::map<std::string, SQLConn*> ConnMap;
  */
 enum SQLstatus { CREAD, CWRITE, WREAD, WWRITE, RREAD, RWRITE };
 
-unsigned long count(const char * const str, char a)
+static unsigned long count(const char * const str, char a)
 {
        unsigned long n = 0;
        for (const char *p = str; *p; ++p)
@@ -403,8 +403,8 @@ class SQLConn : public EventHandler
                if(!qinprog && queue.totalsize())
                {
                        /* There's no query currently in progress, and there's queries in the queue. */
-                       SQLrequest& query = queue.front();
-                       DoQuery(query);
+                       SQLrequest* query = queue.front();
+                       DoQuery(*query);
                }
 
                if(PQconsumeInput(sql))
@@ -421,10 +421,10 @@ class SQLConn : public EventHandler
                        else if (qinprog)
                        {
                                /* Grab the request we're processing */
-                               SQLrequest& query = queue.front();
+                               SQLrequest* query = queue.front();
 
                                /* Get a pointer to the module we're about to return the result to */
-                               Module* to = query.GetSource();
+                               Module* to = query->source;
 
                                /* Fetch the result.. */
                                PGresult* result = PQgetResult(sql);
@@ -444,10 +444,10 @@ class SQLConn : public EventHandler
                                if(to)
                                {
                                        /* ..and the result */
-                                       PgSQLresult reply(us, to, query.id, result);
+                                       PgSQLresult reply(us, to, query->id, result);
 
                                        /* Fix by brain, make sure the original query gets sent back in the reply */
-                                       reply.query = query.query.q;
+                                       reply.query = query->query.q;
 
                                        switch(PQresultStatus(result))
                                        {
@@ -709,13 +709,13 @@ class SQLConn : public EventHandler
 
        SQLerror Query(const SQLrequest &req)
        {
-               queue.push(req);
+               queue.push(new SQLrequest(req));
 
                if(!qinprog && queue.totalsize())
                {
                        /* There's no query currently in progress, and there's queries in the queue. */
-                       SQLrequest& query = queue.front();
-                       return DoQuery(query);
+                       SQLrequest* query = queue.front();
+                       return DoQuery(*query);
                }
                else
                {
@@ -763,27 +763,20 @@ class ModulePgSQL : public Module
        unsigned long currid;
        char* sqlsuccess;
        ReconnectTimer* retimer;
-
+       ServiceProvider sqlserv;
  public:
        ModulePgSQL()
-       : currid(0)
+       : currid(0), sqlserv(this, "SQL/pgsql", SERVICE_DATA)
        {
-               ServerInstance->Modules->UseInterface("SQLutils");
-
                sqlsuccess = new char[strlen(SQLSUCCESS)+1];
 
                strlcpy(sqlsuccess, SQLSUCCESS, strlen(SQLSUCCESS));
 
-               if (!ServerInstance->Modules->PublishFeature("SQL", this))
-               {
-                       throw ModuleException("BUG: PgSQL Unable to publish feature 'SQL'");
-               }
-
                ReadConf();
 
-               ServerInstance->Modules->PublishInterface("SQL", this);
-               Implementation eventlist[] = { I_OnUnloadModule, I_OnRequest, I_OnRehash };
-               ServerInstance->Modules->Attach(eventlist, this, 3);
+               ServerInstance->Modules->AddService(sqlserv);
+               Implementation eventlist[] = { I_OnUnloadModule, I_OnRehash };
+               ServerInstance->Modules->Attach(eventlist, this, 2);
        }
 
        virtual ~ModulePgSQL()
@@ -792,9 +785,6 @@ class ModulePgSQL : public Module
                        ServerInstance->Timers->DelTimer(retimer);
                ClearAllConnections();
                delete[] sqlsuccess;
-               ServerInstance->Modules->UnpublishInterface("SQL", this);
-               ServerInstance->Modules->UnpublishFeature("SQL");
-               ServerInstance->Modules->DoneWithInterface("SQLutils");
        }
 
 
@@ -911,30 +901,26 @@ class ModulePgSQL : public Module
                ServerInstance->Timers->AddTimer(retimer);
        }
 
-       virtual const char* OnRequest(Request* request)
+       void OnRequest(Request& request)
        {
-               if(strcmp(SQLREQID, request->GetId()) == 0)
+               if(strcmp(SQLREQID, request.id) == 0)
                {
-                       SQLrequest* req = (SQLrequest*)request;
+                       SQLrequest* req = (SQLrequest*)&request;
                        ConnMap::iterator iter;
                        if((iter = connections.find(req->dbid)) != connections.end())
                        {
                                /* Execute query */
                                req->id = NewID();
                                req->error = iter->second->Query(*req);
-
-                               return (req->error.Id() == SQL_NO_ERROR) ? sqlsuccess : NULL;
                        }
                        else
                        {
                                req->error.Id(SQL_BAD_DBID);
-                               return NULL;
                        }
                }
-               return NULL;
        }
 
-       virtual void OnUnloadModule(Module* mod, const std::string&     name)
+       virtual void OnUnloadModule(Module* mod)
        {
                /* When a module unloads we have to check all the pending queries for all our connections
                 * and set the Module* specifying where the query came from to NULL. If the query has already
@@ -958,7 +944,7 @@ class ModulePgSQL : public Module
 
        virtual Version GetVersion()
        {
-               return Version("PostgreSQL Service Provider module for all other m_sql* modules, uses v2 of the SQL API", VF_VENDOR|VF_SERVICEPROVIDER, API_VERSION);
+               return Version("PostgreSQL Service Provider module for all other m_sql* modules, uses v2 of the SQL API", VF_VENDOR);
        }
 };