From f697c8291936d2548b1096700f54f36eb3505cc8 Mon Sep 17 00:00:00 2001
From: Tastyfish <crazychris32@gmail.com>
Date: Sat, 14 Apr 2012 16:31:38 -0400
Subject: [PATCH] disabled books ever using sql

---
 code/game/magic/archived_book.dm |  3 ++-
 code/game/magic/library.dm       | 21 +++++----------------
 2 files changed, 7 insertions(+), 17 deletions(-)

diff --git a/code/game/magic/archived_book.dm b/code/game/magic/archived_book.dm
index 8443444aa3..d8452caa83 100644
--- a/code/game/magic/archived_book.dm
+++ b/code/game/magic/archived_book.dm
@@ -1,6 +1,7 @@
 #define BOOK_VERSION_MIN	1
 #define BOOK_VERSION_MAX	2
 #define BOOK_PATH			"data/books/"
+#define BOOKS_USE_SQL		0				// no guarentee for this branch to work right with sql
 
 var/global/datum/book_manager/book_mgr = new()
 
@@ -41,7 +42,7 @@ datum/book_manager/proc/freeid()
 	if(!isbn)
 		return
 
-	if(config.sql_enabled)
+	if(BOOKS_USE_SQL && config.sql_enabled)
 		var/DBConnection/dbcon = new()
 		dbcon.Connect("dbi:mysql:[sqldb]:[sqladdress]:[sqlport]","[sqllogin]","[sqlpass]")
 		if(!dbcon.IsConnected())
diff --git a/code/game/magic/library.dm b/code/game/magic/library.dm
index b99bf92575..4cdef6e855 100644
--- a/code/game/magic/library.dm
+++ b/code/game/magic/library.dm
@@ -2,17 +2,6 @@
 //
 //	Library SQL Configuration
 //
-//*******************************
-
-// Deprecated! See global.dm for new SQL config vars -- TLE
-/*
-#define SQL_ADDRESS ""
-#define SQL_DB ""
-#define SQL_PORT "3306"
-#define SQL_LOGIN ""
-#define SQL_PASS ""
-*/
-
 //*******************************
 // Requires Dantom.DB library ( http://www.byond.com/developer/Dantom/DB )
 
@@ -499,7 +488,7 @@ datum/borrowbook // Datum used to keep track of who has borrowed what when and f
 			dat += "<A href='?src=\ref[src];setauthor=1'>Filter by Author: [author]</A><BR>"
 			dat += "<A href='?src=\ref[src];search=1'>\[Start Search\]</A><BR>"
 		if(1)
-			if(config.sql_enabled)
+			if(BOOKS_USE_SQL && config.sql_enabled)
 				var/DBConnection/dbcon = new()
 				dbcon.Connect("dbi:mysql:[sqldb]:[sqladdress]:[sqlport]","[sqllogin]","[sqlpass]")
 				if(!dbcon.IsConnected())
@@ -563,7 +552,7 @@ datum/borrowbook // Datum used to keep track of who has borrowed what when and f
 			author = null
 		author = dd_replacetext(author, "'", "''")
 	if(href_list["search"])
-		if(config.sql_enabled)
+		if(BOOKS_USE_SQL && config.sql_enabled)
 			SQLquery = "SELECT author, title, category, id FROM library WHERE "
 			if(category == "Any")
 				SQLquery += "author LIKE '%[author]%' AND title LIKE '%[title]%'"
@@ -659,7 +648,7 @@ datum/borrowbook // Datum used to keep track of who has borrowed what when and f
 			dat += "<A href='?src=\ref[src];switchscreen=0'>(Return to main menu)</A><BR>"
 		if(4)
 			dat += "<h3>External Archive</h3>"
-			if(config.sql_enabled)
+			if(BOOKS_USE_SQL && config.sql_enabled)
 				var/DBConnection/dbcon = new()
 				dbcon.Connect("dbi:mysql:[sqldb]:[sqladdress]:[sqlport]","[sqllogin]","[sqlpass]")
 				if(!dbcon.IsConnected())
@@ -821,7 +810,7 @@ datum/borrowbook // Datum used to keep track of who has borrowed what when and f
 			if(scanner.cache)
 				var/choice = input("Are you certain you wish to upload this title to the Archive?") in list("Confirm", "Abort")
 				if(choice == "Confirm")
-					if(config.sql_enabled)
+					if(BOOKS_USE_SQL && config.sql_enabled)
 						var/DBConnection/dbcon = new()
 						dbcon.Connect("dbi:mysql:[sqldb]:[sqladdress]:[sqlport]","[sqllogin]","[sqlpass]")
 						if(!dbcon.IsConnected())
@@ -868,7 +857,7 @@ datum/borrowbook // Datum used to keep track of who has borrowed what when and f
 						log_game("[usr.name]/[usr.key] has uploaded the book titled [scanner.cache.name], [length(scanner.cache.dat)] signs")
 						alert("Upload Complete.")
 	if(href_list["targetid"])
-		if(config.sql_enabled)
+		if(BOOKS_USE_SQL && config.sql_enabled)
 			var/sqlid = href_list["targetid"]
 			var/DBConnection/dbcon = new()
 			dbcon.Connect("dbi:mysql:[sqldb]:[sqladdress]:[sqlport]","[sqllogin]","[sqlpass]")