* Merge changes from prposed changes

[infobot.git] / scripts / dbm2mysql.pl

diff --git a/scripts/dbm2mysql.pl b/scripts/dbm2mysql.pl
index 2a28679d714479605f2b589f0d14771aa425b221..b2592827735a9d87ba1d89536f101b3723d21150 100755 (executable)
--- a/scripts/dbm2mysql.pl
+++ b/scripts/dbm2mysql.pl
@@ -12,6 +12,8 @@ require "src/Files.pl";
 require "src/dbi.pl";
 package main;
 
+# todo: main()
+
 if (!scalar @ARGV) {
     print "Usage: dbm2mysql <whatever dbm>\n";
     print "Example: dbm2mysql.pl apt\n";
@@ -24,40 +26,27 @@ my $key;
 my %db;
 
 # open dbm.
-if (dbmopen(%{ $dbm }, $dbfile, 0666)) {
-    &status("::: opening dbm file: $dbfile");
-} else {
+if (!dbmopen(%db, $dbfile, 0666)) {
     &ERROR("Failed open to dbm file ($dbfile).");
     exit 1;
 }
+&status("::: opening dbm file: $dbfile");
 
-### open all the data...
-&loadConfig("files/blootbot.config");
+# open all the data...
+&loadConfig("files/infobot.config");
 $dbname = $param{'DBName'};
 my $dbh_mysql = sqlOpenDB($param{'DBName'},
        $param{'DBType'}, $param{'SQLUser'}, $param{'SQLPass'});
+print "DEBUG: scalar db == '". scalar(keys %db) ."'.\n";
 
-print "scalar db == '". scalar(keys %db) ."'.\n";
-
-my ($ndef, $i) = (1,1);
 my $factoid;
+my $ndef = 1;
+my $i = 1;
 foreach $factoid (keys %db) {
-    # blootbot dbm to sql support:
-    if (0) {
-       foreach (@DBM::extra_format) {
-#          my $val = &getFactInfo($key, $_, $db{$key});
-           if (!defined $val) {
-               $ndef++;
-               next;
-           }
-       }
-    } else {
-       # infobot dbm to blootbot sql support.
-        &sqlReplace("factoids", {
-               factoid_key     => $_,
-               factoid_value   => $db{$_},
-       } );
-    }
+    &sqlReplace("factoids", {
+       factoid_key     => $_,
+       factoid_value   => $db{$_},
+    } );
 
     $i++;
     print "i=$i... " if ($i % 100 == 0);
@@ -66,4 +55,6 @@ foreach $factoid (keys %db) {
 
 print "Done.\n";
 &closeDB();
-dbmclose(%{ $dbm });
+dbmclose(%db);
+
+# vim:ts=4:sw=4:expandtab:tw=80