X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FDBM%2FDeep%2FHash.pm;h=bb50c59ec5951a76b4f47179baad666e96f4bd5b;hb=f9c3318778fb8f7926ec199c81f6278b2052c2ac;hp=e315a5df8a4e0844cc13b5dfed41b3f218285638;hpb=217fef02cc3ece43b124bd36f9efba53dbbc5fe5;p=dbsrgits%2FDBM-Deep.git

diff --git a/lib/DBM/Deep/Hash.pm b/lib/DBM/Deep/Hash.pm
index e315a5d..bb50c59 100644
--- a/lib/DBM/Deep/Hash.pm
+++ b/lib/DBM/Deep/Hash.pm
@@ -5,7 +5,25 @@ use strict;
 use base 'DBM::Deep';
 
 sub _get_self {
-    eval { tied( %{$_[0]} ) } || $_[0]
+    eval { local $SIG{'__DIE__'}; tied( %{$_[0]} ) } || $_[0]
+}
+
+sub _repr { shift;return { @_ } }
+
+sub _import {
+    my $self = shift;
+    my ($struct) = @_;
+
+    eval {
+        local $SIG{'__DIE__'};
+        foreach my $key (keys %$struct) {
+            $self->put($key, $struct->{$key});
+        }
+    }; if ($@) {
+        $self->_throw_error("Cannot import: type mismatch");
+    }
+
+    return 1;
 }
 
 sub TIEHASH {
@@ -13,54 +31,67 @@ sub TIEHASH {
     # Tied hash constructor method, called by Perl's tie() function.
     ##
     my $class = shift;
-    my $args;
-    if (scalar(@_) > 1) {
-        if ( @_ % 2 ) {
-            $class->_throw_error( "Odd number of parameters to TIEHASH" );
-        }
-        $args = {@_};
-    }
-    #XXX This use of ref() is bad and is a bug
-    elsif (ref($_[0])) { $args = $_[0]; }
-    else { $args = { file => shift }; }
+    my $args = $class->_get_args( @_ );
     
     $args->{type} = $class->TYPE_HASH;
 
     return $class->_init($args);
 }
 
+sub FETCH {
+    my $self = shift->_get_self;
+    my $key = ($self->_root->{filter_store_key})
+        ? $self->_root->{filter_store_key}->($_[0])
+        : $_[0];
+
+    return $self->SUPER::FETCH( $key );
+}
+
 sub STORE {
     my $self = shift->_get_self;
-	my $key = ($self->root->{filter_store_key})
-        ? $self->root->{filter_store_key}->($_[0])
+	my $key = ($self->_root->{filter_store_key})
+        ? $self->_root->{filter_store_key}->($_[0])
         : $_[0];
     my $value = $_[1];
 
     return $self->SUPER::STORE( $key, $value );
 }
 
+sub EXISTS {
+    my $self = shift->_get_self;
+	my $key = ($self->_root->{filter_store_key})
+        ? $self->_root->{filter_store_key}->($_[0])
+        : $_[0];
+
+    return $self->SUPER::EXISTS( $key );
+}
+
+sub DELETE {
+    my $self = shift->_get_self;
+	my $key = ($self->_root->{filter_store_key})
+        ? $self->_root->{filter_store_key}->($_[0])
+        : $_[0];
+
+    return $self->SUPER::DELETE( $key );
+}
+
 sub FIRSTKEY {
 	##
 	# Locate and return first key (in no particular order)
 	##
-    my $self = $_[0]->_get_self;
+    my $self = shift->_get_self;
 
 	##
-	# Make sure file is open
-	##
-	if (!defined($self->fh)) { $self->_open(); }
-	
-	##
 	# Request shared lock for reading
 	##
 	$self->lock( $self->LOCK_SH );
 	
-	my $result = $self->_get_next_key();
+	my $result = $self->{engine}->get_next_key($self);
 	
 	$self->unlock();
 	
-	return ($result && $self->root->{filter_fetch_key})
-        ? $self->root->{filter_fetch_key}->($result)
+	return ($result && $self->_root->{filter_fetch_key})
+        ? $self->_root->{filter_fetch_key}->($result)
         : $result;
 }
 
@@ -68,38 +99,47 @@ sub NEXTKEY {
 	##
 	# Return next key (in no particular order), given previous one
 	##
-    my $self = $_[0]->_get_self;
+    my $self = shift->_get_self;
 
-	my $prev_key = ($self->root->{filter_store_key})
-        ? $self->root->{filter_store_key}->($_[1])
-        : $_[1];
+	my $prev_key = ($self->_root->{filter_store_key})
+        ? $self->_root->{filter_store_key}->($_[0])
+        : $_[0];
 
-	my $prev_md5 = $DBM::Deep::DIGEST_FUNC->($prev_key);
+	my $prev_md5 = $self->{engine}{digest}->($prev_key);
 
 	##
-	# Make sure file is open
-	##
-	if (!defined($self->fh)) { $self->_open(); }
-	
-	##
 	# Request shared lock for reading
 	##
 	$self->lock( $self->LOCK_SH );
 	
-	my $result = $self->_get_next_key( $prev_md5 );
+	my $result = $self->{engine}->get_next_key( $self, $prev_md5 );
 	
 	$self->unlock();
 	
-	return ($result && $self->root->{filter_fetch_key})
-        ? $self->root->{filter_fetch_key}->($result)
+	return ($result && $self->_root->{filter_fetch_key})
+        ? $self->_root->{filter_fetch_key}->($result)
         : $result;
 }
 
 ##
 # Public method aliases
 ##
-*first_key = *FIRSTKEY;
-*next_key = *NEXTKEY;
+sub first_key { (shift)->FIRSTKEY(@_) }
+sub next_key { (shift)->NEXTKEY(@_) }
+
+sub _copy_node {
+    my $self = shift->_get_self;
+    my ($db_temp) = @_;
+
+    my $key = $self->first_key();
+    while ($key) {
+        my $value = $self->get($key);
+        $self->_copy_value( \$db_temp->{$key}, $value );
+        $key = $self->next_key($key);
+    }
+
+    return 1;
+}
 
 1;
 __END__