X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FDBM%2FDeep.pm;h=bb73250789349fb56377e25178e239e98f492634;hb=0ca7ea98550b6f782b4b68be8b261218ff097f74;hp=8fd2fa3adb9aced7d00acf091f71fb5943610dd5;hpb=baa27ab605a6fdcaa7cdc2d2a3e9ce3ba81fdd5b;p=dbsrgits%2FDBM-Deep.git

diff --git a/lib/DBM/Deep.pm b/lib/DBM/Deep.pm
index 8fd2fa3..bb73250 100644
--- a/lib/DBM/Deep.pm
+++ b/lib/DBM/Deep.pm
@@ -104,6 +104,29 @@ sub TYPE_HASH   () { return SIG_HASH; }
 sub TYPE_ARRAY  () { return SIG_ARRAY; }
 sub TYPE_SCALAR () { return SIG_SCALAR; }
 
+sub _get_args {
+    my $proto = shift;
+
+    my $args;
+    if (scalar(@_) > 1) {
+        if ( @_ % 2 ) {
+            $proto->_throw_error( "Odd number of parameters to " . (caller(1))[2] );
+        }
+        $args = {@_};
+    }
+	elsif ( my $type = Scalar::Util::reftype($_[0]) ) {
+        if ( $type ne 'HASH' ) {
+            $proto->_throw_error( "Not a hashref in args to " . (caller(1))[2] );
+        }
+        $args = $_[0];
+    }
+	else {
+        $args = { file => shift };
+    }
+
+    return $args;
+}
+
 sub new {
 	##
 	# Class constructor method for Perl OO interface.
@@ -111,9 +134,7 @@ sub new {
 	# providing a hybrid OO/tie interface.
 	##
 	my $class = shift;
-	my $args;
-	if (scalar(@_) > 1) { $args = {@_}; }
-	else { $args = { file => shift }; }
+	my $args = $class->_get_args( @_ );
 	
 	##
 	# Check if we want a tied hash or array.
@@ -1364,7 +1385,7 @@ sub DELETE {
 	# Delete single key/value pair or element given plain key or array index
 	##
     my $self = $_[0]->_get_self;
-	my $key = ($self->root->{filter_store_key} && $self->type eq TYPE_HASH) ? $self->root->{filter_store_key}->($_[1]) : $_[1];
+	my $key = $_[1];
 	
 	my $unpacked_key = $key;
 	if (($self->type eq TYPE_ARRAY) && ($key =~ /^\d+$/)) { $key = pack($LONG_PACK, $key); }