summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbrain <brain@e03df62e-2008-0410-955e-edbf42e46eb7>2005-04-21 12:15:56 +0000
committerbrain <brain@e03df62e-2008-0410-955e-edbf42e46eb7>2005-04-21 12:15:56 +0000
commit2eafeefbb1d2f96a5c59874a93d22cd6721ecde4 (patch)
tree0799ee94c32714f2ac6ce2d8c2dc450473ccfbbf
parentf7a0c180d8d6dc4618b53892c04ca7af64e0841e (diff)
New stuff actually compiles now
git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@1150 e03df62e-2008-0410-955e-edbf42e46eb7
-rw-r--r--src/modules/extra/m_sql.cpp38
-rw-r--r--src/modules/extra/m_sql.h10
2 files changed, 26 insertions, 22 deletions
diff --git a/src/modules/extra/m_sql.cpp b/src/modules/extra/m_sql.cpp
index 489f2ddd4..d2b5802de 100644
--- a/src/modules/extra/m_sql.cpp
+++ b/src/modules/extra/m_sql.cpp
@@ -220,13 +220,13 @@ class ModuleSQL : public Module
{
for (ConnectionList::iterator i = Connections.begin(); i != Connections.end(); i++)
{
- if ((i->GetID() == r->GetConnID()) && (i->Enabled()))
+ if ((i->GetID() == r->GetConnID()) && (i->IsEnabled()))
{
bool xr = i->QueryResult(r->GetQuery());
if (!xr)
{
res->SetType(SQL_ERROR);
- res->SetError(r->GetError());
+ res->SetError(i->GetError());
return;
}
}
@@ -237,7 +237,7 @@ class ModuleSQL : public Module
{
for (ConnectionList::iterator i = Connections.begin(); i != Connections.end(); i++)
{
- if ((i->GetID() == r->GetConnID()) && (i->Enabled()))
+ if ((i->GetID() == r->GetConnID()) && (i->IsEnabled()))
{
res->SetType(SQL_COUNT);
res->SetCount(i->QueryCount(r->GetQuery()));
@@ -250,7 +250,7 @@ class ModuleSQL : public Module
{
for (ConnectionList::iterator i = Connections.begin(); i != Connections.end(); i++)
{
- if ((i->GetID() == r->GetConnID()) && (i->Enabled()))
+ if ((i->GetID() == r->GetConnID()) && (i->IsEnabled()))
{
std::map<std::string,std::string> row = i->GetRow();
res->SetRow(row);
@@ -264,21 +264,25 @@ class ModuleSQL : public Module
char* OnRequest(Request* request)
{
- SQLResult Result = new SQLResult();
- SQLRequest *r = (SQLRequest*)request;
- switch (r->GetRequest())
+ if (request)
{
- case SQL_RESULT:
- ResultType(r,Result);
- break;
- case SQL_COUNT:
- CountType(r,Result);
- break;
- case SQL_ROW:
- RowType(r,Result);
- break;
+ SQLResult* Result = new SQLResult();
+ SQLRequest *r = (SQLRequest*)request->GetData();
+ switch (r->GetQueryType())
+ {
+ case SQL_RESULT:
+ ResultType(r,Result);
+ break;
+ case SQL_COUNT:
+ CountType(r,Result);
+ break;
+ case SQL_ROW:
+ RowType(r,Result);
+ break;
+ }
+ return (char*)Result;
}
- return Result;
+ return NULL;
}
ModuleSQL()
diff --git a/src/modules/extra/m_sql.h b/src/modules/extra/m_sql.h
index 768551bf3..0620dedf7 100644
--- a/src/modules/extra/m_sql.h
+++ b/src/modules/extra/m_sql.h
@@ -14,7 +14,7 @@
// so that we can neatly pass information around the
// system.
-class SQLRequest : public Request
+class SQLRequest
{
protected:
long conn_id;
@@ -26,7 +26,7 @@ class SQLRequest : public Request
conn_id = id;
}
- long GetConnID(long id)
+ long GetConnID()
{
return conn_id;
}
@@ -36,7 +36,7 @@ class SQLRequest : public Request
request_type = t;
}
- int GetQueryType(int t)
+ int GetQueryType()
{
return request_type;
}
@@ -54,7 +54,7 @@ class SQLRequest : public Request
// Upon completion, an SQLRequest returns an SQLResponse.
-class SQLResponse
+class SQLResult
{
protected:
int resptype;
@@ -86,7 +86,7 @@ class SQLResponse
int GetType()
{
- return restype;
+ return resptype;
}
std::string GetError()