From: dms <dms@c11ca15a-4712-0410-83d8-924469b57eb5>
Date: Sun, 24 Nov 2002 12:57:32 +0000 (+0000)
Subject: - use new sql functions
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=60c3fd95e2da9e7c622e9b41916e456b6a0dda78;p=infobot.git

- use new sql functions
  although at the same time, news support has been removed
  (trying to move over to sql backend... difficult!)


git-svn-id: https://svn.code.sf.net/p/infobot/code/trunk@702 c11ca15a-4712-0410-83d8-924469b57eb5
---

diff --git a/blootbot/src/core.pl b/blootbot/src/core.pl
index e3118e9..dbdc509 100644
--- a/blootbot/src/core.pl
+++ b/blootbot/src/core.pl
@@ -113,8 +113,7 @@ sub doExit {
 	&writeUserFile();
 	&writeChanFile();
 	&uptimeWriteFile()	if (&IsChanConf("uptime"));
-	&News::writeNews()	if (&ChanConfList("news"));
-	&closeDB();
+	&sqlCloseDB();
 	&closeSHM($shm);
 	&dumpallvars()		if (&IsParam("dumpvarsAtExit"));
 	&symdumpAll()		if (&IsParam("symdumpAtExit"));
@@ -427,12 +426,11 @@ sub setup {
 
     $shm = &openSHM();
     &openSQLDebug()	if (&IsParam("SQLDebug"));
-    &openDB($param{'DBName'}, $param{'DBType'}, $param{'SQLUser'},
+    &sqlOpenDB($param{'DBName'}, $param{'DBType'}, $param{'SQLUser'},
 	$param{'SQLPass'});
     &checkTables();
 
     &status("Setup: ". &countKeys("factoids") ." factoids.");
-    &News::readNews() if (&ChanConfList("news"));
     &getChanConfDefault("sendPrivateLimitLines", 3);
     &getChanConfDefault("sendPrivateLimitBytes", 1000);
     &getChanConfDefault("sendPublicLimitLines", 3);
@@ -498,9 +496,8 @@ sub shutdown {
     # unless they're write-only, like uptime.
     &writeUserFile();
     &writeChanFile();
-    &News::writeNews()	if (&ChanConfList("news"));
 
-    &closeDB();
+    &sqlCloseDB();
     &closeSHM($shm);	# aswell. TODO: use this in &doExit?
     &closeLog();
 }