remove Berkeley DBM support

[infobot.git] / src / modules.pl

diff --git a/src/modules.pl b/src/modules.pl
index e8e2e2b76ee86218a7eabc9069e04b1ad5ca291f..278e673309bbce59d9d281a86636f545c7c03bf8 100644 (file)
--- a/src/modules.pl
+++ b/src/modules.pl
@@ -5,7 +5,8 @@
 #     Created: 20000624
 #
 
-#use strict;
+# use strict;  # TODO
+
 use vars qw($AUTOLOAD);
 
 ###
@@ -54,19 +55,20 @@ if ($@) {
        "zfi"           => "zfi.pl",
        "zippy"         => "Zippy.pl",
        "zsi"           => "zsi.pl",
+       "botmail"       => "botmail.pl",
 );
 ### THIS IS NOT LOADED ON RELOAD :(
 my @myModulesLoadNow;
 my @myModulesReloadNot;
 BEGIN {
-    @myModulesLoadNow  = ('topic', 'uptime', 'news', 'rootWarn', 'symdump');
+    @myModulesLoadNow  = ('topic', 'uptime', 'news', 'rootWarn', 'symdump', 'botmail');
     @myModulesReloadNot        = ('IRC/Irc.pl','IRC/Schedulers.pl');
 }
 
 sub loadCoreModules {
     my @mods = &getPerlFiles($bot_src_dir);
 
-    &status("Loading ".scalar(@mods)." CORE modules...");
+    &status("Loading CORE modules...");
 
     foreach (sort @mods) {
        my $mod = "$bot_src_dir/$_";
@@ -84,38 +86,23 @@ sub loadCoreModules {
 }
 
 sub loadDBModules {
-    my $f = "$bot_src_dir/modules.pl";
-    $moduleAge{$f} = (stat $f)[9];
+    my $f;
+    # todo: use function to load module.
 
-    if ($param{'DBType'} =~ /^mysql$/i) {
-       eval "use DBI";
-       if ($@) {
-           &ERROR("libdbd-mysql-perl is not installed!");
-           exit 1;
-       }
-       &status("Loading MySQL support.");
-       $f = "$bot_src_dir/db_mysql.pl";
-       require $f;
-       $moduleAge{$f} = (stat $f)[9];
-       &showProc(" (DBI // mysql)");
-    } elsif ($param{'DBType'} =~ /^pgsql$/i) {
-#      eval "use Pg";
+    if ($param{'DBType'} =~ /^(mysql|SQLite|pgsql)$/i) {
        eval "use DBI";
        if ($@) {
-           &ERROR("libpgperl is not installed!");
+           &ERROR("No support for DBI::" . $param{'DBType'} . ", exiting!");
            exit 1;
        }
-       &status("Loading pgsql support.");
-       require "$bot_src_dir/db_pgsql.pl";
-       &showProc(" (pgsql)");
-    } elsif ($param{'DBType'} =~ /^sqlite$|^dbm$/i) {
        &status("Loading " . $param{'DBType'} . " support.");
-       $f="$bot_src_dir/db_" . $param{'DBType'} . ".pl";
-       $moduleAge{$f} = (stat $f)[9];
+       $f = "$bot_src_dir/dbi.pl";
        require $f;
-       &showProc(" $bot_src_dir/db_" . $param{'DBType'} . ".pl");
+       $moduleAge{$f} = (stat $f)[9];
+
+       &showProc(" (DBI::" . $param{'DBType'} . ")");
     } else {
-       &status("DB support DISABLED.");
+       &WARN("DB support DISABLED.");
        return;
     }
 }