remove Berkeley DBM support

[infobot.git] / src / modules.pl

diff --git a/src/modules.pl b/src/modules.pl
index babaec00891db7a143de7e227d07cb47176661f7..278e673309bbce59d9d281a86636f545c7c03bf8 100644 (file)
--- a/src/modules.pl
+++ b/src/modules.pl
@@ -61,7 +61,7 @@ if ($@) {
 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');
 }
 
@@ -89,54 +89,18 @@ sub loadDBModules {
     my $f;
     # todo: use function to load module.
 
-    if ($param{'DBType'} =~ /^mysql$/i) {
+    if ($param{'DBType'} =~ /^(mysql|SQLite|pgsql)$/i) {
        eval "use DBI";
        if ($@) {
-           &ERROR("libdbd-mysql-perl is not installed!");
+           &ERROR("No support for DBI::" . $param{'DBType'} . ", exiting!");
            exit 1;
        }
-       &status("Loading MySQL support.");
+       &status("Loading " . $param{'DBType'} . " support.");
        $f = "$bot_src_dir/dbi.pl";
        require $f;
        $moduleAge{$f} = (stat $f)[9];
 
-       &showProc(" (DBI::mysql)");
-
-    } elsif ($param{'DBType'} =~ /^pgsql$/i) {
-       eval "use DBI";
-       if ($@) {
-           &ERROR("libpgperl is not installed!");
-           exit 1;
-       }
-       &status("Loading pgsql support.");
-       $f = "$bot_src_dir/dbi.pl";
-       require $f;
-       $moduleAge{$f} = (stat $f)[9];
-
-       &showProc(" (DBI::pgsql)");
-
-    } elsif ($param{'DBType'} =~ /^sqlite$/i) {
-       eval "use DBI";
-       if ($@) {
-           &ERROR("libdbd-sqlite-perl is not installed!");
-           exit 1;
-       }
-       &status("Loading SQLite support.");
-#      $f = "$bot_src_dir/dbi.pl";
-       $f = "$bot_src_dir/db_sqlite.pl";
-       require $f;
-       $moduleAge{$f} = (stat $f)[9];
-
-       &showProc(" (DBI::SQLite)");
-
-    } elsif ($param{'DBType'} =~ /^dbm$/i) {
-       &status("Loading dbm support.");
-       $f = "$bot_src_dir/dbm.pl";
-       require $f;
-       $moduleAge{$f} = (stat $f)[9];
-
-       &showProc(" (dbm.pl)");
-
+       &showProc(" (DBI::" . $param{'DBType'} . ")");
     } else {
        &WARN("DB support DISABLED.");
        return;