X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FDBM%2FDeep%2FHash.pm;h=3602a90b1aaa2337ea406b823813052c1b987fc4;hb=807f63a7218ff60795f39942940df83687eeeb77;hp=30f4e901f34e9e54c2650b790e865328a562b606;hpb=2ac020421a5a06ac144cfe6650ff0a2738c74448;p=dbsrgits%2FDBM-Deep.git

diff --git a/lib/DBM/Deep/Hash.pm b/lib/DBM/Deep/Hash.pm
index 30f4e90..3602a90 100644
--- a/lib/DBM/Deep/Hash.pm
+++ b/lib/DBM/Deep/Hash.pm
@@ -1,11 +1,30 @@
 package DBM::Deep::Hash;
 
+use 5.006_000;
+
 use strict;
+use warnings;
+
+our $VERSION = q(1.0002);
 
 use base 'DBM::Deep';
 
 sub _get_self {
-    eval { tied( %{$_[0]} ) } || $_[0]
+    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) = @_;
+
+    foreach my $key (keys %$struct) {
+        $self->put($key, $struct->{$key});
+    }
+
+    return 1;
 }
 
 sub TIEHASH {
@@ -13,39 +32,71 @@ sub TIEHASH {
     # Tied hash constructor method, called by Perl's tie() function.
     ##
     my $class = shift;
-    my $args;
-    if (scalar(@_) > 1) { $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;
+    DBM::Deep->_throw_error( "Cannot use an undefined hash key." ) unless defined $_[0];
+    my $key = ($self->_storage->{filter_store_key})
+        ? $self->_storage->{filter_store_key}->($_[0])
+        : $_[0];
+
+    return $self->SUPER::FETCH( $key, $_[0] );
+}
+
+sub STORE {
+    my $self = shift->_get_self;
+    DBM::Deep->_throw_error( "Cannot use an undefined hash key." ) unless defined $_[0];
+	my $key = ($self->_storage->{filter_store_key})
+        ? $self->_storage->{filter_store_key}->($_[0])
+        : $_[0];
+    my $value = $_[1];
+
+    return $self->SUPER::STORE( $key, $value, $_[0] );
+}
+
+sub EXISTS {
+    my $self = shift->_get_self;
+    DBM::Deep->_throw_error( "Cannot use an undefined hash key." ) unless defined $_[0];
+	my $key = ($self->_storage->{filter_store_key})
+        ? $self->_storage->{filter_store_key}->($_[0])
+        : $_[0];
+
+    return $self->SUPER::EXISTS( $key );
+}
+
+sub DELETE {
+    my $self = shift->_get_self;
+    DBM::Deep->_throw_error( "Cannot use an undefined hash key." ) unless defined $_[0];
+	my $key = ($self->_storage->{filter_store_key})
+        ? $self->_storage->{filter_store_key}->($_[0])
+        : $_[0];
+
+    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;
 
 	##
-	# 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->_storage->{filter_fetch_key})
+        ? $self->_storage->{filter_fetch_key}->($result)
         : $result;
 }
 
@@ -53,38 +104,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->_storage->{filter_store_key})
+        ? $self->_storage->{filter_store_key}->($_[0])
+        : $_[0];
 
 	##
-	# 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_key );
 	
 	$self->unlock();
 	
-	return ($result && $self->root->{filter_fetch_key})
-        ? $self->root->{filter_fetch_key}->($result)
+	return ($result && $self->_storage->{filter_fetch_key})
+        ? $self->_storage->{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__