X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FDBM%2FDeep%2FHash.pm;h=ddaae9d82505027d829e8123e70b5f7a3bcf6f56;hb=bd01f6ece548569503416cc1af17f72d7bd532cc;hp=bdfc0e1ca0bfe2efcb61e20259414049adf96fab;hpb=6736c116ef9e98a3145a13206639ade5efe967ba;p=dbsrgits%2FDBM-Deep.git

diff --git a/lib/DBM/Deep/Hash.pm b/lib/DBM/Deep/Hash.pm
index bdfc0e1..ddaae9d 100644
--- a/lib/DBM/Deep/Hash.pm
+++ b/lib/DBM/Deep/Hash.pm
@@ -1,6 +1,11 @@
 package DBM::Deep::Hash;
 
+use 5.6.0;
+
 use strict;
+use warnings;
+
+our $VERSION = q(0.99_03);
 
 use base 'DBM::Deep';
 
@@ -8,6 +13,25 @@ sub _get_self {
     eval { local $SIG{'__DIE__'}; tied( %{$_[0]} ) } || $_[0]
 }
 
+#XXX Need to add a check here for @_ % 2
+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 {
     ##
     # Tied hash constructor method, called by Perl's tie() function.
@@ -22,27 +46,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 );
@@ -50,30 +74,30 @@ 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 {
 	##
 	# Locate and return first key (in no particular order)
 	##
-    my $self = $_[0]->_get_self;
+    my $self = shift->_get_self;
 
 	##
 	# Request shared lock for reading
 	##
 	$self->lock( $self->LOCK_SH );
 	
-	my $result = $self->{engine}->get_next_key($self);
+	my $result = $self->_engine->get_next_key($self->_base_offset);
 	
 	$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;
 }
 
@@ -81,33 +105,45 @@ sub NEXTKEY {
 	##
 	# Return next key (in no particular order), given previous one
 	##
-    my $self = $_[0]->_get_self;
-
-	my $prev_key = ($self->_root->{filter_store_key})
-        ? $self->_root->{filter_store_key}->($_[1])
-        : $_[1];
+    my $self = shift->_get_self;
 
-	my $prev_md5 = $DBM::Deep::DIGEST_FUNC->($prev_key);
+	my $prev_key = ($self->_fileobj->{filter_store_key})
+        ? $self->_fileobj->{filter_store_key}->($_[0])
+        : $_[0];
 
 	##
 	# Request shared lock for reading
 	##
 	$self->lock( $self->LOCK_SH );
 	
-	my $result = $self->{engine}->get_next_key( $self, $prev_md5 );
+	my $result = $self->_engine->get_next_key( $self->_base_offset, $prev_key );
 	
 	$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;
 }
 
 ##
 # 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;
+    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__