X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=lib%2FOnis%2FData%2FPersistent%2FDbm.pm;h=2e1cac6748cc3662f388c00ea7f737306f56accd;hb=34031a5be99f9952dc602bb4a28c7a826bef5e6d;hp=397ae8cd8437cd51df51cc68825cfa5a5a869c64;hpb=22c3a558a0abcacc2ee3327a5f69d152a538f201;p=onis.git

diff --git a/lib/Onis/Data/Persistent/Dbm.pm b/lib/Onis/Data/Persistent/Dbm.pm
index 397ae8c..2e1cac6 100644
--- a/lib/Onis/Data/Persistent/Dbm.pm
+++ b/lib/Onis/Data/Persistent/Dbm.pm
@@ -5,7 +5,7 @@ use warnings;
 
 BEGIN
 {
-	@AnyDBM_File::ISA = (qw(GDBM_File DB_File GDBM_File SDBM_File NDBM_File ODBM_File));
+	@AnyDBM_File::ISA = (qw(DB_File GDBM_File SDBM_File NDBM_File ODBM_File));
 }
 
 use Carp qw(carp confess);
@@ -28,13 +28,14 @@ Storage backend that uses DBM files for storing data permanently.
 
 =item B<dbm_directory>: I<E<lt>dirE<gt>>
 
-Directory in which the DBM-files are kept.
+Directory in which the DBM-files are kept. Defaults to the B<var>-directory in
+onis' main directory.. 
 
 =back
 
 =cut
 
-our $DBMDirectory = get_config ('dbm_directory') || 'var';
+our $DBMDirectory = get_config ('storage_dir') || 'var';
 $DBMDirectory =~ s#/$##g;
 
 if (!$DBMDirectory or !-d $DBMDirectory)
@@ -171,9 +172,8 @@ sub keys
 	my $val;
 
 	no strict (qw(subs));
-	for (($key, $val) = $db->FIRSTKEY (); ($key, $val) = $db->NEXTKEY ($key);)
+	for (($key, $val) = $db->FIRSTKEY (); defined ($key) and defined ($val); ($key, $val) = $db->NEXTKEY ($key))
 	{
-		die unless (defined ($key));
 		next if (defined ($obj->{'cache'}{$key}));
 
 		$obj->{'cache'}{$key} = [split ($Alarm, $val)];