From 3192b5c2d5d0f4218b2e4a41f81827bca445ee0c Mon Sep 17 00:00:00 2001 From: dms Date: Tue, 2 Oct 2001 12:49:51 +0000 Subject: [PATCH] - renamed Factoids/Misc.pl to Factoids/Core.pl - removed db_sql.pl (basically moved to logger.pl) - seen is now case insensitive - missed one more instance of new dbReplace - moved factoid specific stuff out of db_*.sql to Factoids/DBCommon.pl - typo in pgsql.pl, kill me! - typo in dict --- thanks to lear! git-svn-id: https://svn.code.sf.net/p/infobot/code/trunk/blootbot@516 c11ca15a-4712-0410-83d8-924469b57eb5 --- src/CommandStubs.pl | 4 ++-- src/Factoids/{Misc.pl => Core.pl} | 0 src/Factoids/DBCommon.pl | 29 +++++++++++++++++++++++++++++ src/IRC/Schedulers.pl | 2 +- src/Misc.pl | 2 +- src/Modules/Dict.pl | 4 ++-- src/db_mysql.pl | 30 +----------------------------- src/db_pgsql.pl | 30 +----------------------------- src/db_sql.pl | 20 -------------------- src/logger.pl | 8 ++++++++ src/modules.pl | 9 ++++----- 11 files changed, 49 insertions(+), 89 deletions(-) rename src/Factoids/{Misc.pl => Core.pl} (100%) delete mode 100644 src/db_sql.pl diff --git a/src/CommandStubs.pl b/src/CommandStubs.pl index 5e2754f..9b9eec5 100644 --- a/src/CommandStubs.pl +++ b/src/CommandStubs.pl @@ -564,7 +564,8 @@ sub uptime { # seen. sub seen { - my($person) = @_; + my($person) = lc shift; + $person =~ s/\?*$//; if (!defined $person or $person =~ /^$/) { &help("seen"); @@ -577,7 +578,6 @@ sub seen { } my @seen; - $person =~ s/\?*$//; &seenFlush(); # very evil hack. oh well, better safe than sorry. diff --git a/src/Factoids/Misc.pl b/src/Factoids/Core.pl similarity index 100% rename from src/Factoids/Misc.pl rename to src/Factoids/Core.pl diff --git a/src/Factoids/DBCommon.pl b/src/Factoids/DBCommon.pl index 48b2eee..eddd7fa 100644 --- a/src/Factoids/DBCommon.pl +++ b/src/Factoids/DBCommon.pl @@ -16,6 +16,35 @@ sub setFactInfo { ); } +##### +# Usage: &getFactInfo($faqtoid, [$what]); +sub main::getFactInfo { + return &dbGet("factoids", $_[1], "factoid_key=".&dbQuote($_[0]) ); +} + +##### +# Usage: &getFactoid($faqtoid); +sub main::getFactoid { + return &getFactInfo($_[0], "factoid_value"); +} + +##### +# Usage: &setFactInfo($faqtoid, $type, $what); +sub main::setFactInfo { + &dbSet("factoids", "factoid_key", $_[0], $_[1], $_[2]); +} + +##### +# Usage: &delFactoid($faqtoid); +sub main::delFactoid { + my ($faqtoid) = @_; + + &dbDel("factoids", "factoid_key",$faqtoid); + &status("DELETED $faqtoid"); + + return 1; +} + ##### # Usage: &IsLocked($faqtoid); sub IsLocked { diff --git a/src/IRC/Schedulers.pl b/src/IRC/Schedulers.pl index 1a2d48c..cde5537 100644 --- a/src/IRC/Schedulers.pl +++ b/src/IRC/Schedulers.pl @@ -553,7 +553,7 @@ sub seenFlush { if ($param{'DBType'} =~ /^(mysql|pgsql)$/i) { foreach $nick (keys %seencache) { my $retval = &dbReplace("seen", "nick", ( - "nick" => $seencache{$nick}{'nick'}, + "nick" => lc $seencache{$nick}{'nick'}, "time" => $seencache{$nick}{'time'}, "host" => $seencache{$nick}{'host'}, "channel" => $seencache{$nick}{'chan'}, diff --git a/src/Misc.pl b/src/Misc.pl index 0b39297..6edda5f 100644 --- a/src/Misc.pl +++ b/src/Misc.pl @@ -642,7 +642,7 @@ sub closeStats { ); $hash{time} = time() if ($z); - &dbReplace("stats", %hash); + &dbReplace("stats", "nick", %hash); } } diff --git a/src/Modules/Dict.pl b/src/Modules/Dict.pl index 3212b62..22b6422 100644 --- a/src/Modules/Dict.pl +++ b/src/Modules/Dict.pl @@ -43,7 +43,7 @@ sub Dict { $socket->autoflush(1); # required. my $num; - if ($query =~ /^(\d+)\s+/) { + if ($query =~ s/^(\d+)\s+//) { $num = $1; } @@ -58,7 +58,7 @@ sub Dict { my $total = scalar @results; if (defined $num and ($num > $total or $num < 1)) { - &msg($::who, "error: choice in definition is out of range."); + &::msg($::who, "error: choice in definition is out of range."); return; } diff --git a/src/db_mysql.pl b/src/db_mysql.pl index b8fa2c2..cb7b136 100644 --- a/src/db_mysql.pl +++ b/src/db_mysql.pl @@ -270,7 +270,7 @@ sub dbInsert { } ##### -# Usage: &dbReplace($table, $key %hash); +# Usage: &dbReplace($table, $key, %hash); # Note: dbReplace does optional dbQuote. sub dbReplace { my ($table, $key, %hash) = @_; @@ -455,34 +455,6 @@ sub searchTable { return @results; } -#################################################################### -##### Factoid related stuff... -##### - -##### -# Usage: &getFactInfo($faqtoid, $type); -# Note: getFactInfo does dbQuote -sub getFactInfo { - return &dbGet("factoids", $_[1], "factoid_key=".&dbQuote($_[0]) ); -} - -##### -# Usage: &getFactoid($faqtoid); -sub getFactoid { - return &getFactInfo($_[0], "factoid_value"); -} - -##### -# Usage: &delFactoid($faqtoid); -sub delFactoid { - my ($faqtoid) = @_; - - &dbDel("factoids", "factoid_key",$faqtoid); - &status("DELETED '$faqtoid'"); - - return 1; -} - sub dbCreateTable { my($table) = @_; my(@path) = (".","..","../.."); diff --git a/src/db_pgsql.pl b/src/db_pgsql.pl index e32d0b7..7d025f9 100644 --- a/src/db_pgsql.pl +++ b/src/db_pgsql.pl @@ -282,7 +282,7 @@ sub dbReplace { } $uquery .= "$keys[-1] = $vals[-1], "; } - $uquery = ~s/, $/ $where;/; + $uquery =~ s/, $/ $where;/; $iquery .= "(". join(',',@keys) .") VALUES (". join(',',@vals) .");"; &DEBUG($squery) if (0); @@ -451,34 +451,6 @@ sub searchTable { return @results; } -#################################################################### -##### Factoid related stuff... -##### - -##### -# Usage: &getFactInfo($faqtoid, $type); -# Note: getFactInfo does dbQuote -sub getFactInfo { - return &dbGet("factoids", $_[1], "factoid_key=".&dbQuote($_[0]) ); -} - -##### -# Usage: &getFactoid($faqtoid); -sub getFactoid { - return &getFactInfo($_[0], "factoid_value"); -} - -##### -# Usage: &delFactoid($faqtoid); -sub delFactoid { - my ($faqtoid) = @_; - - &dbDel("factoids", "factoid_key",$faqtoid); - &status("DELETED '$faqtoid'"); - - return 1; -} - ##### # sub checkTables { diff --git a/src/db_sql.pl b/src/db_sql.pl deleted file mode 100644 index e13c41b..0000000 --- a/src/db_sql.pl +++ /dev/null @@ -1,20 +0,0 @@ -# -# db_mysql.pl: {my,pg}SQL database frontend. -# Author: dms -# Version: v0.1 (20010908) -# Created: 20010908 -# - -package main; - -if (&IsParam("useStrict")) { use strict; } - -sub SQLDebug { - return unless (&IsParam("SQLDebug")); - - return unless (fileno SQLDEBUG); - - print SQLDEBUG $_[0]."\n"; -} - -1; diff --git a/src/logger.pl b/src/logger.pl index 5601b91..f550962 100644 --- a/src/logger.pl +++ b/src/logger.pl @@ -373,4 +373,12 @@ sub closeSQLDebug { &status("Closed SQL Debug file: $param{'SQLDebug'}"); } +sub SQLDebug { + return unless (&IsParam("SQLDebug")); + + return unless (fileno SQLDEBUG); + + print SQLDEBUG $_[0]."\n"; +} + 1; diff --git a/src/modules.pl b/src/modules.pl index e0c881a..e55f015 100644 --- a/src/modules.pl +++ b/src/modules.pl @@ -87,20 +87,19 @@ sub loadDBModules { &showProc(" (DBI // mysql)"); &status(" using MySQL support."); - require "$bot_src_dir/db_sql.pl"; require "$bot_src_dir/db_mysql.pl"; $moduleAge{"$bot_src_dir/db_mysql.pl"} = time(); } elsif ($param{'DBType'} =~ /^pgsql$/i) { - eval "use Pg"; +# eval "use Pg"; + eval "use DBI"; if ($@) { &ERROR("libpgperl is not installed!"); exit 1; } - &showProc(" (Pg // postgreSQLl)"); + &showProc(" (pgsql)"); - &status(" using PostgreSQL support."); - require "$bot_src_dir/db_sql.pl"; + &status(" using pgsql support."); require "$bot_src_dir/db_pgsql.pl"; } elsif ($param{'DBType'} =~ /^dbm$/i) { -- 2.39.2