X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=src%2Fcokebank_sqlite%2Fmain.c;h=bf4d3f23d102b0459171373ad5461d2bd926c673;hb=8b29fa5c5682518aa42b7502c3ca33adaaeaecf8;hp=0d5e1396a88460c35c9889b58013277b2bdebe91;hpb=df71d48cc0082a5333203384cfbce040cf54a155;p=tpg%2Fopendispense2.git

diff --git a/src/cokebank_sqlite/main.c b/src/cokebank_sqlite/main.c
index 0d5e139..bf4d3f2 100644
--- a/src/cokebank_sqlite/main.c
+++ b/src/cokebank_sqlite/main.c
@@ -15,6 +15,8 @@
 #include "../cokebank.h"
 #include <sqlite3.h>
 
+#define DEBUG	0
+
 const char * const csBank_DatabaseSetup = 
 "CREATE TABLE IF NOT EXISTS accounts ("
 "	acct_id INTEGER PRIMARY KEY NOT NULL,"
@@ -35,6 +37,14 @@ const char * const csBank_DatabaseSetup =
 "	FOREIGN KEY (acct_id) REFERENCES accounts (acct_id) ON DELETE CASCADE"
 //	                 Deletion of the account frees the card  ^ ^ ^
 ");"
+"CREATE TABLE IF NOT EXISTS items ("
+"	item_id INTEGER PRIMARY KEY NOT NULL,"
+"	item_handler STRING NOT NULL,"
+"	item_index INTEGER NOT NULL,"
+"	item_name STRING NOT NULL,"
+"	item_price INTEGER NOT NULL,"
+"	item_is_enabled BOOLEAN NOT NULL DEFAULT true"
+");"
 "INSERT INTO accounts (acct_name,acct_is_admin,acct_uid) VALUES ('root',1,0);"
 "INSERT INTO accounts (acct_name,acct_is_internal,acct_uid) VALUES ('"COKEBANK_SALES_ACCT"',1,-1);"
 "INSERT INTO accounts (acct_name,acct_is_internal,acct_uid) VALUES ('"COKEBANK_DEBT_ACCT"',1,-2);"
@@ -92,7 +102,7 @@ int Bank_Initialise(const char *Argument)
 			return 1;
 		}
 		
-		Log_Info("SQLite database rebuilt");
+		Log_Info("SQLite database rebuilt (%s)", Argument);
 	}
 	else
 	{
@@ -121,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 )
@@ -134,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 )
@@ -210,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 )
@@ -286,9 +300,9 @@ int Bank_GetAcctByName(const char *Name)
 	if( !statement )	return -1;
 	
 	ret = sqlite3_column_int(statement, 0);
-	if( ret == 0 )	return -1;
-	
 	sqlite3_finalize(statement);
+	
+	if( ret == 0 )	return -1;
 	return ret;
 }
 
@@ -442,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;
@@ -538,14 +552,28 @@ sqlite3_stmt *Bank_int_QuerySingle(sqlite3 *Database, const char *Query)
 	sqlite3_stmt	*ret;
 	 int	rv;
 	
+	#if DEBUG
+	printf("Bank_int_QuerySingle: (Query='%s')\n", Query);
+	#endif
+	
 	// Prepare query
 	ret = Bank_int_MakeStatemnt(Database, Query);
-	if( !ret )	return NULL;
+	if( !ret ) {
+		#if DEBUG >= 2
+		printf("Bank_int_QuerySingle: RETURN NULL ret=NULL\n");
+		#endif
+		return NULL;
+	}
 	
 	// Get row
 	rv = sqlite3_step(ret);
 	// - Empty result set
-	if( rv == SQLITE_DONE )	return NULL;
+	if( rv == SQLITE_DONE ) {
+		#if DEBUG >= 2
+		printf("Bank_int_QuerySingle: RETURN NULL (rv == SQLITE_DONE)\n");
+		#endif
+		return NULL;
+	}
 	// - Other error
 	if( rv != SQLITE_ROW ) {
 		fprintf(stderr, "SQLite Error: %s\n", sqlite3_errmsg(gBank_Database));
@@ -553,6 +581,9 @@ sqlite3_stmt *Bank_int_QuerySingle(sqlite3 *Database, const char *Query)
 		return NULL;
 	}
 	
+	#if DEBUG >= 2
+	printf("Bank_int_QuerySingle: RETURN %p\n", ret);
+	#endif
 	return ret;
 }
 
@@ -561,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;