X-Git-Url: http://git.pjr.cc/?p=gwvp.git;a=blobdiff_plain;f=gwvplib%2Fgwvpdatabase.php;h=5823c0c315b81451032333361f4f26ba14d384b4;hp=acb1a7a28ee474c63d4cd327a84045a623df25dd;hb=4f4bf1da18181d412cd755143e016ede587cc1d6;hpb=6199ff804b1a84555edfd5320f2301c489c06b03

diff --git a/gwvplib/gwvpdatabase.php b/gwvplib/gwvpdatabase.php
index acb1a7a..5823c0c 100644
--- a/gwvplib/gwvpdatabase.php
+++ b/gwvplib/gwvpdatabase.php
@@ -3,6 +3,11 @@
 global $DB_CONNECTION;
 $DB_CONNECTION = false;
 
+
+global $db_url, $db_type;
+error_log("in include for database, $db_type, $db_name");
+
+
 // i need to figure out how i do data encapsulation here. We'll support mysql and sqlite3 off the bat if we can - sqlite3 comes first tho
 function gwvp_dbCreateMysqlStructure()
 {
@@ -200,10 +205,15 @@ function gwvp_setConfigVal($confname, $confval)
 function gwvp_isDBSetup()
 {
 	// for sqlite, we just check if the db exists, for everyone else, we check for a conneciton and go yay or nay
-	global $WEB_ROOT_FS, $BASE_URL, $data_directory, $db_type, $db_url;
-
+	global $WEB_ROOT_FS, $BASE_URL, $data_directory, $db_type, $db_name;
+	
+	// oh this isnt working. poo.
+	error_log("checking for $db_name, $db_type");
+	
 	if($db_type == "sqlite") {
-		if(file_exists($db_url)) return true;
+		if(file_exists($db_name)) {
+			return true;
+		}
 		else return false;
 	}
 
@@ -216,6 +226,8 @@ function gwvp_ConnectDB()
 	global $WEB_ROOT_FS, $BASE_URL, $data_directory, $db_type, $db_name, $DB_CONNECTION;
 
 	// first check if $DB_CONNECTION IS live
+	error_log("in connection $db_type, $db_name");
+	
 	if($DB_CONNECTION != false) return $DB_CONNECTION;
 
 	if($db_type == "sqlite") {