X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fextra%2Fm_testclient.cpp;h=27394425586f014374bac4ad88757c33c42b6f68;hb=563ad5acb0fb3d1aee5094989377d8b284d33d92;hp=10229dd992d9c3f94ac061e7e42af8676a2ab34e;hpb=0b29e01eb5169f5e547b87c32de8e452ba3eff17;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/extra/m_testclient.cpp b/src/modules/extra/m_testclient.cpp
index 10229dd99..273944255 100644
--- a/src/modules/extra/m_testclient.cpp
+++ b/src/modules/extra/m_testclient.cpp
@@ -1,122 +1,105 @@
-#include <string>
+/*       +------------------------------------+
+ *       | Inspire Internet Relay Chat Daemon |
+ *       +------------------------------------+
+ *
+ *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ * See: http://www.inspircd.org/wiki/index.php/Credits
+ *
+ * This program is free but copyrighted software; see
+ *            the file COPYING for details.
+ *
+ * ---------------------------------------------------
+ */
 
-#include "users.h"
-#include "channels.h"
-#include "modules.h"
-#include "helperfuncs.h"
 #include "inspircd.h"
-#include "configreader.h"
 #include "m_sqlv2.h"
 
-
-
 class ModuleTestClient : public Module
 {
 private:
-	
+
 
 public:
 	ModuleTestClient(InspIRCd* Me)
-		: Module::Module(Me)
+		: Module(Me)
 	{
+		Implementation eventlist[] = { I_OnRequest, I_OnBackgroundTimer };
+		ServerInstance->Modules->Attach(eventlist, this, 2);
 	}
 
-	void Implements(char* List)
-	{
-		List[I_OnRequest] = List[I_OnBackgroundTimer] = 1;
-	}
-		
+
 	virtual Version GetVersion()
 	{
-		return Version(1, 0, 0, 0, VF_VENDOR);
+		return Version("$Id$", VF_VENDOR, API_VERSION);
 	}
-	
-	virtual void OnBackgroundTimer(time_t foo)
+
+	virtual void OnBackgroundTimer(time_t)
 	{
-		Module* target = ServerInstance->FindFeature("SQL");
-		
+		Module* target = ServerInstance->Modules->FindFeature("SQL");
+
 		if(target)
 		{
-			SQLrequest foo = SQLreq(this, target, "foo", "UPDATE rawr SET foo = '?' WHERE bar = 42", ConvToStr(time(NULL)));
-			
+			SQLrequest foo = SQLrequest(this, target, "foo",
+					SQLquery("UPDATE rawr SET foo = '?' WHERE bar = 42") % ServerInstance->Time());
+
 			if(foo.Send())
 			{
-				log(DEBUG, "Sent query, got given ID %lu", foo.id);
+				ServerInstance->Logs->Log("m_testclient.so", DEBUG, "Sent query, got given ID %lu", foo.id);
 			}
 			else
 			{
-				log(DEBUG, "SQLrequest failed: %s", foo.error.Str());
+				ServerInstance->Logs->Log("m_testclient.so", DEBUG, "SQLrequest failed: %s", foo.error.Str());
 			}
 		}
 	}
-	
-	virtual char* OnRequest(Request* request)
+
+	virtual const char* OnRequest(Request* request)
 	{
 		if(strcmp(SQLRESID, request->GetId()) == 0)
 		{
-			log(DEBUG, "Got SQL result (%s)", request->GetId());
-		
+			ServerInstance->Logs->Log("m_testclient.so", DEBUG, "Got SQL result (%s)", request->GetId());
+
 			SQLresult* res = (SQLresult*)request;
 
-			if (res->error.Id() == NO_ERROR)
+			if (res->error.Id() == SQL_NO_ERROR)
 			{
 				if(res->Cols())
 				{
-					log(DEBUG, "Got result with %d rows and %d columns", res->Rows(), res->Cols());
+					ServerInstance->Logs->Log("m_testclient.so", DEBUG, "Got result with %d rows and %d columns", res->Rows(), res->Cols());
 
 					for (int r = 0; r < res->Rows(); r++)
 					{
-						log(DEBUG, "Row %d:", r);
-						
+						ServerInstance->Logs->Log("m_testclient.so", DEBUG, "Row %d:", r);
+
 						for(int i = 0; i < res->Cols(); i++)
 						{
-							log(DEBUG, "\t[%s]: %s", res->ColName(i).c_str(), res->GetValue(r, i).d.c_str());
+							ServerInstance->Logs->Log("m_testclient.so", DEBUG, "\t[%s]: %s", res->ColName(i).c_str(), res->GetValue(r, i).d.c_str());
 						}
 					}
 				}
 				else
 				{
-					log(DEBUG, "%d rows affected in query", res->Rows());
+					ServerInstance->Logs->Log("m_testclient.so", DEBUG, "%d rows affected in query", res->Rows());
 				}
 			}
 			else
 			{
-				log(DEBUG, "SQLrequest failed: %s", res->error.Str());
-				
+				ServerInstance->Logs->Log("m_testclient.so", DEBUG, "SQLrequest failed: %s", res->error.Str());
+
 			}
-		
+
 			return SQLSUCCESS;
 		}
-		
-		log(DEBUG, "Got unsupported API version string: %s", request->GetId());
-		
+
+		ServerInstance->Logs->Log("m_testclient.so", DEBUG, "Got unsupported API version string: %s", request->GetId());
+
 		return NULL;
 	}
-	
-	virtual ~ModuleTestClient()
-	{
-	}	
-};
 
-class ModuleTestClientFactory : public ModuleFactory
-{
- public:
-	ModuleTestClientFactory()
-	{
-	}
-	
-	~ModuleTestClientFactory()
-	{
-	}
-	
-	virtual Module * CreateModule(InspIRCd* Me)
+	virtual ~ModuleTestClient()
 	{
-		return new ModuleTestClient(Me);
 	}
 };
 
+MODULE_INIT(ModuleTestClient)
 
-extern "C" void * init_module( void )
-{
-	return new ModuleTestClientFactory;
-}