From e79c0245555b975c385c51f1290060aba2ec05d4 Mon Sep 17 00:00:00 2001 From: dms Date: Thu, 5 Dec 2002 15:58:38 +0000 Subject: [PATCH] - Applied patch from Morten. Thanks. git-svn-id: https://svn.code.sf.net/p/infobot/code/trunk@724 c11ca15a-4712-0410-83d8-924469b57eb5 --- blootbot/src/CommandStubs.pl | 2 +- blootbot/src/Files.pl | 4 ++-- blootbot/src/dbi.pl | 8 ++++---- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/blootbot/src/CommandStubs.pl b/blootbot/src/CommandStubs.pl index b7d5984..47dc9d3 100644 --- a/blootbot/src/CommandStubs.pl +++ b/blootbot/src/CommandStubs.pl @@ -341,7 +341,7 @@ sub Modules { # this is way fucking ugly. my %hash = &sqlSelectColHash("stats", "nick,counter", - undef, + { }, $where." ORDER BY counter DESC LIMIT 3", 1 ); my $i; diff --git a/blootbot/src/Files.pl b/blootbot/src/Files.pl index 75c52a1..a3dae2e 100644 --- a/blootbot/src/Files.pl +++ b/blootbot/src/Files.pl @@ -48,7 +48,7 @@ sub loadLang { close FILE; $file =~ s/^.*\///; - &status("Loaded lang $file ($langCount items)"); + &status("Loaded $file ($langCount items)"); } # File: Irc Servers list. @@ -77,7 +77,7 @@ sub loadIRCServers { close FILE; $file =~ s/^.*\///; - &status("Loaded ircServers $file (". scalar(@ircServers) ." servers)"); + &status("Loaded $file (". scalar(@ircServers) ." servers)"); } 1; diff --git a/blootbot/src/dbi.pl b/blootbot/src/dbi.pl index cd2bd35..e0f48c4 100644 --- a/blootbot/src/dbi.pl +++ b/blootbot/src/dbi.pl @@ -39,8 +39,8 @@ sub sqlOpenDB { if ($dbh && !$dbh->err) { &status("Opened $type connection$hoststr"); } else { - &ERROR("cannot connect$hoststr."); - &ERROR("since $type is not available, shutting down bot!"); + &ERROR("Cannot connect$hoststr."); + &ERROR("Since $type is not available, shutting down bot!"); &ERROR( $dbh->errstr ) if ($dbh); &closePID(); &closeSHM($shm); @@ -579,7 +579,7 @@ sub searchTable { return @results; } -sub dbCreateTable { +sub sqlCreateTable { my($table) = @_; my(@path) = ($bot_data_dir, ".","..","../.."); my $found = 0; @@ -605,7 +605,7 @@ sub dbCreateTable { if (!$found) { return 0; } else { - &sqlRaw("dbcreateTable($table)", $data); + &sqlRaw("sqlCreateTable($table)", $data); return 1; } } -- 2.39.2