X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=InternetSecure.pm;h=4f0e3db0253671a69b1383155c8f5fa0240b63b3;hb=d3c665aa8eadcd5284daf8f8c9b7525ed6bbc542;hp=61e210b69a4aa5d1fe0fa0dbcb43ec527388eb76;hpb=aee9564f2cae2cd7b63aba4d52105dbf24422bae;p=Business-OnlinePayment-InternetSecure.git

diff --git a/InternetSecure.pm b/InternetSecure.pm
index 61e210b..4f0e3db 100755
--- a/InternetSecure.pm
+++ b/InternetSecure.pm
@@ -12,7 +12,7 @@ use XML::Simple qw(xml_in xml_out);
 use base qw(Business::OnlinePayment Exporter);
 
 
-our $VERSION = '0.01';
+our $VERSION = '0.03';
 
 
 use constant SUCCESS_CODES => qw(2000 90000 900P1);
@@ -50,37 +50,20 @@ sub set_defaults {
 	$self->tax_amounts( {} );
 }
 
-# OnlinePayment's get_fields now filters out undefs in 3.x. :(
+# Combine get_fields and remap_fields for convenience.  Unlike OnlinePayment's
+# remap_fields, this doesn't modify content(), and can therefore be called
+# more than once.  Also, unlike OnlinePayment's get_fields in 3.x, this doesn't
+# exclude undefs.
 #
-sub get_fields {
-	my ($self, @fields) = @_;
-
-	my %content = $self->content;
-
-	my %new = map +($_ => $content{$_}), @fields;
-
-	return %new;
-}
-
-# OnlinePayment's remap_fields is buggy in 2.x; this is copied from 3.x
-#
-sub remap_fields {
+sub get_remap_fields {
 	my ($self, %map) = @_;
 
 	my %content = $self->content();
-	foreach (keys %map) {
-		$content{$map{$_}} = delete $content{$_};
-	}
-	$self->content(%content);
-}
+	my %data;
 
-# Combine get_fields and remap_fields for convenience
-#
-sub get_remap_fields {
-	my ($self, %map) = @_;
-
-	$self->remap_fields(reverse %map);
-	my %data = $self->get_fields(keys %map);
+	while (my ($to, $from) = each %map) {
+		$data{$to} = $content{$from};
+	}
 
 	return %data;
 }