X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;ds=sidebyside;f=src%2Fcokebank_sqlite%2Fmain.c;h=bf4d3f23d102b0459171373ad5461d2bd926c673;hb=85b50d7c9a9cc85d38f5b1703aed4f3ad7585f9a;hp=e53910502fc7c2b78b1368a56977955c66ac2e98;hpb=10fc79a2f4f72165cb1ce1ba78c84faa8d56f5db;p=tpg%2Fopendispense2.git

diff --git a/src/cokebank_sqlite/main.c b/src/cokebank_sqlite/main.c
index e539105..bf4d3f2 100644
--- a/src/cokebank_sqlite/main.c
+++ b/src/cokebank_sqlite/main.c
@@ -15,7 +15,7 @@
 #include "../cokebank.h"
 #include <sqlite3.h>
 
-#define DEBUG	1
+#define DEBUG	0
 
 const char * const csBank_DatabaseSetup = 
 "CREATE TABLE IF NOT EXISTS accounts ("
@@ -102,7 +102,7 @@ int Bank_Initialise(const char *Argument)
 			return 1;
 		}
 		
-		Log_Info("SQLite database rebuilt");
+		Log_Info("SQLite database rebuilt (%s)", Argument);
 	}
 	else
 	{
@@ -131,7 +131,7 @@ int Bank_Transfer(int SourceUser, int DestUser, int Ammount, const char *Reason)
 
 	// Take from the source
 	query = mkstr("UPDATE accounts SET acct_balance=acct_balance-%i,acct_last_seen=datetime('now') WHERE acct_id=%i", Ammount, SourceUser);
-	printf("query = \"%s\"\n", query);
+//	printf("query = \"%s\"\n", query);
 	rv = sqlite3_exec(gBank_Database, query, NULL, NULL, &errmsg);
 	free(query);
 	if( rv != SQLITE_OK )
@@ -144,7 +144,7 @@ int Bank_Transfer(int SourceUser, int DestUser, int Ammount, const char *Reason)
 
 	// Give to the destination
 	query = mkstr("UPDATE accounts SET acct_balance=acct_balance+%i,acct_last_seen=datetime('now') WHERE acct_id=%i", Ammount, DestUser);
-	printf("query = \"%s\"\n", query);
+//	printf("query = \"%s\"\n", query);
 	rv = sqlite3_exec(gBank_Database, query, NULL, NULL, &errmsg);
 	free(query);
 	if( rv != SQLITE_OK )
@@ -220,6 +220,10 @@ int Bank_SetFlags(int UserID, int Mask, int Value)
 		);
 	#undef MAP_FLAG
 
+	#if DEBUG
+	printf("Bank_SetFlags: query=\"%s\"\n", query);
+	#endif
+
 	// Execute Query
 	rv = sqlite3_exec(gBank_Database, query, NULL, NULL, &errmsg);
 	if( rv != SQLITE_OK )
@@ -452,7 +456,7 @@ int Bank_GetUserAuth(const char *Salt, const char *Username, const char *Passwor
 {
 	Salt = Password = Username;	// Shut up GCC
 	// DEBUG HACKS!
-	#if 1
+	#if 0
 	return Bank_GetAcctByName(Username);
 	#else
 	return -1;
@@ -555,7 +559,7 @@ sqlite3_stmt *Bank_int_QuerySingle(sqlite3 *Database, const char *Query)
 	// Prepare query
 	ret = Bank_int_MakeStatemnt(Database, Query);
 	if( !ret ) {
-		#if DEBUG
+		#if DEBUG >= 2
 		printf("Bank_int_QuerySingle: RETURN NULL ret=NULL\n");
 		#endif
 		return NULL;
@@ -565,7 +569,7 @@ sqlite3_stmt *Bank_int_QuerySingle(sqlite3 *Database, const char *Query)
 	rv = sqlite3_step(ret);
 	// - Empty result set
 	if( rv == SQLITE_DONE ) {
-		#if DEBUG
+		#if DEBUG >= 2
 		printf("Bank_int_QuerySingle: RETURN NULL (rv == SQLITE_DONE)\n");
 		#endif
 		return NULL;
@@ -577,7 +581,7 @@ sqlite3_stmt *Bank_int_QuerySingle(sqlite3 *Database, const char *Query)
 		return NULL;
 	}
 	
-	#if DEBUG
+	#if DEBUG >= 2
 	printf("Bank_int_QuerySingle: RETURN %p\n", ret);
 	#endif
 	return ret;
@@ -588,6 +592,7 @@ sqlite3_stmt *Bank_int_QuerySingle(sqlite3 *Database, const char *Query)
  */
 int Bank_int_IsValidName(const char *Name)
 {
+	if( !Name )	return 0;
 	while(*Name)
 	{
 		if( *Name == '\'' )	return 0;