Cleaned up auditing some more

[dbsrgits/DBM-Deep.git] / lib / DBM / Deep / Hash.pm

diff --git a/lib/DBM/Deep/Hash.pm b/lib/DBM/Deep/Hash.pm
index bb50c59..6957be8 100644 (file)
--- a/lib/DBM/Deep/Hash.pm
+++ b/lib/DBM/Deep/Hash.pm
@@ -1,6 +1,9 @@
 package DBM::Deep::Hash;
 
+use 5.6.0;
+
 use strict;
+use warnings;
 
 use base 'DBM::Deep';
 
@@ -40,27 +43,27 @@ sub TIEHASH {
 
 sub FETCH {
     my $self = shift->_get_self;
-    my $key = ($self->_root->{filter_store_key})
-        ? $self->_root->{filter_store_key}->($_[0])
+    my $key = ($self->_fileobj->{filter_store_key})
+        ? $self->_fileobj->{filter_store_key}->($_[0])
         : $_[0];
 
-    return $self->SUPER::FETCH( $key );
+    return $self->SUPER::FETCH( $key, $_[0] );
 }
 
 sub STORE {
     my $self = shift->_get_self;
-       my $key = ($self->_root->{filter_store_key})
-        ? $self->_root->{filter_store_key}->($_[0])
+       my $key = ($self->_fileobj->{filter_store_key})
+        ? $self->_fileobj->{filter_store_key}->($_[0])
         : $_[0];
     my $value = $_[1];
 
-    return $self->SUPER::STORE( $key, $value );
+    return $self->SUPER::STORE( $key, $value, $_[0] );
 }
 
 sub EXISTS {
     my $self = shift->_get_self;
-       my $key = ($self->_root->{filter_store_key})
-        ? $self->_root->{filter_store_key}->($_[0])
+       my $key = ($self->_fileobj->{filter_store_key})
+        ? $self->_fileobj->{filter_store_key}->($_[0])
         : $_[0];
 
     return $self->SUPER::EXISTS( $key );
@@ -68,11 +71,11 @@ sub EXISTS {
 
 sub DELETE {
     my $self = shift->_get_self;
-       my $key = ($self->_root->{filter_store_key})
-        ? $self->_root->{filter_store_key}->($_[0])
+       my $key = ($self->_fileobj->{filter_store_key})
+        ? $self->_fileobj->{filter_store_key}->($_[0])
         : $_[0];
 
-    return $self->SUPER::DELETE( $key );
+    return $self->SUPER::DELETE( $key, $_[0] );
 }
 
 sub FIRSTKEY {
@@ -90,8 +93,8 @@ sub FIRSTKEY {
        
        $self->unlock();
        
-       return ($result && $self->_root->{filter_fetch_key})
-        ? $self->_root->{filter_fetch_key}->($result)
+       return ($result && $self->_fileobj->{filter_fetch_key})
+        ? $self->_fileobj->{filter_fetch_key}->($result)
         : $result;
 }
 
@@ -101,8 +104,8 @@ sub NEXTKEY {
        ##
     my $self = shift->_get_self;
 
-       my $prev_key = ($self->_root->{filter_store_key})
-        ? $self->_root->{filter_store_key}->($_[0])
+       my $prev_key = ($self->_fileobj->{filter_store_key})
+        ? $self->_fileobj->{filter_store_key}->($_[0])
         : $_[0];
 
        my $prev_md5 = $self->{engine}{digest}->($prev_key);
@@ -116,8 +119,8 @@ sub NEXTKEY {
        
        $self->unlock();
        
-       return ($result && $self->_root->{filter_fetch_key})
-        ? $self->_root->{filter_fetch_key}->($result)
+       return ($result && $self->_fileobj->{filter_fetch_key})
+        ? $self->_fileobj->{filter_fetch_key}->($result)
         : $result;
 }
 
@@ -128,7 +131,7 @@ sub first_key { (shift)->FIRSTKEY(@_) }
 sub next_key { (shift)->NEXTKEY(@_) }
 
 sub _copy_node {
-    my $self = shift->_get_self;
+    my $self = shift;
     my ($db_temp) = @_;
 
     my $key = $self->first_key();