X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=lib%2Frbot%2Fdbhash.rb;h=8b128f1b6e618e7ce597cc5b970b0dbd8eca104a;hb=be5d914984e767ce1a718b84d0bad1c88d9f8ea3;hp=2f6f461fb6e46f20b5b710d75a68dc1b9bfd00f1;hpb=a9b32eae21a10254f67653c8ce92076300ba670b;p=user%2Fhenk%2Fcode%2Fruby%2Frbot.git

diff --git a/lib/rbot/dbhash.rb b/lib/rbot/dbhash.rb
index 2f6f461f..8b128f1b 100644
--- a/lib/rbot/dbhash.rb
+++ b/lib/rbot/dbhash.rb
@@ -1,8 +1,17 @@
+#-- vim:sw=2:et
+#++
+#
+# :title: Berkeley DB interface
+
 begin
   require 'bdb'
+rescue LoadError
+  fatal "rbot couldn't load the bdb module, perhaps you need to install it? try: http://www.ruby-lang.org/en/raa-list.rhtml?name=bdb"
 rescue Exception => e
-  error "Got exception: #{e.pretty_inspect}"
-  error "rbot couldn't load the bdb module, perhaps you need to install it? try: http://www.ruby-lang.org/en/raa-list.rhtml?name=bdb"
+  fatal "rbot couldn't load the bdb module: #{e.pretty_inspect}"
+end
+
+if not defined? BDB
   exit 2
 end
 
@@ -43,18 +52,20 @@ module Irc
     def initialize(bot, key, absfilename=false)
       @bot = bot
       @key = key
+      relfilename = @bot.path key
+      relfilename << '.db'
       if absfilename && File.exist?(key)
         # db already exists, use it
         @db = DBHash.open_db(key)
-      elsif File.exist?(@bot.botclass + "/#{key}.db")
-        # db already exists, use it
-        @db = DBHash.open_db(@bot.botclass + "/#{key}.db")
       elsif absfilename
         # create empty db
         @db = DBHash.create_db(key)
+      elsif File.exist? relfilename
+        # db already exists, use it
+        @db = DBHash.open_db relfilename
       else
         # create empty db
-        @db = DBHash.create_db(@bot.botclass + "/#{key}.db")
+        @db = DBHash.create_db relfilename
       end
     end
 
@@ -64,7 +75,7 @@ module Irc
 
     def DBHash.create_db(name)
       debug "DBHash: creating empty db #{name}"
-      return BDB::Hash.open(name, nil, 
+      return BDB::Hash.open(name, nil,
       BDB::CREATE | BDB::EXCL, 0600)
     end
 
@@ -89,27 +100,30 @@ module Irc
       @key = key
       if @@env.nil?
         begin
-          @@env = BDB::Env.open("#{@bot.botclass}", BDB::INIT_TRANSACTION | BDB::CREATE | BDB::RECOVER, "set_lg_max" => @@lg_max)
+          @@env = BDB::Env.open(@bot.botclass, BDB::INIT_TRANSACTION | BDB::CREATE | BDB::RECOVER, "set_lg_max" => @@lg_max)
           debug "DBTree: environment opened with max log size #{@@env.conf['lg_max']}"
         rescue => e
           debug "DBTree: failed to open environment: #{e.pretty_inspect}. Retrying ..."
-          @@env = BDB::Env.open("#{@bot.botclass}", BDB::INIT_TRANSACTION | BDB::CREATE |  BDB::RECOVER)
+          @@env = BDB::Env.open(@bot.botclass, BDB::INIT_TRANSACTION | BDB::CREATE |  BDB::RECOVER)
         end
-        #@@env = BDB::Env.open("#{@bot.botclass}", BDB::CREATE | BDB::INIT_MPOOL | BDB::RECOVER)
+        #@@env = BDB::Env.open(@bot.botclass, BDB::CREATE | BDB::INIT_MPOOL | BDB::RECOVER)
       end
 
+      relfilename = @bot.path key
+      relfilename << '.db'
+
       if absfilename && File.exist?(key)
         # db already exists, use it
         @db = DBTree.open_db(key)
       elsif absfilename
         # create empty db
         @db = DBTree.create_db(key)
-      elsif File.exist?(@bot.botclass + "/#{key}.db")
+      elsif File.exist? relfilename
         # db already exists, use it
-        @db = DBTree.open_db(@bot.botclass + "/#{key}.db")
+        @db = DBTree.open_db relfilename
       else
         # create empty db
-        @db = DBTree.create_db(@bot.botclass + "/#{key}.db")
+        @db = DBTree.create_db relfilename
       end
     end
 
@@ -131,7 +145,7 @@ module Irc
       begin
         debug "DBTree: checkpointing ..."
         @@env.checkpoint
-      rescue Excpetion => e
+      rescue Exception => e
         debug "Failed: #{e.pretty_inspect}"
       end
       begin