[interchange-cvs] interchange - heins modified 2 files

[interchange-core@icdevgroup.org]

User:      heins
Date:      2003-06-30 18:21:44 GMT
Modified:  code/UserTag ups_query.tag
Modified:  lib/Vend/Ship QueryUPS.pm
Log:
* Fix bug caused by incomplete testing on my part.

Revision  Changes    Path
1.8       +2 -1      interchange/code/UserTag/ups_query.tag


rev 1.8, prev_rev 1.7
Index: ups_query.tag
===================================================================
RCS file: /var/cvs/interchange/code/UserTag/ups_query.tag,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ups_query.tag	30 Jun 2003 18:07:20 -0000	1.7
+++ ups_query.tag	30 Jun 2003 18:21:44 -0000	1.8
@@ -37,7 +37,8 @@
 		# do nothing
 	}
 	elsif ($::Variable->{UPS_COUNTRY_REMAP} =~ /=/) {
-		Vend::Util::get_option_hash($::Variable->{UPS_COUNTRY_REMAP}, \%exception);
+		my $new = Vend::Util::get_option_hash($::Variable->{UPS_COUNTRY_REMAP});
+		Vend::Util::get_option_hash(\%exception, $new);
 	}
 	else {
 		Vend::Util::hash_string($::Variable->{UPS_COUNTRY_REMAP}, \%exception);



1.4       +3 -2      interchange/lib/Vend/Ship/QueryUPS.pm


rev 1.4, prev_rev 1.3
Index: QueryUPS.pm
===================================================================
RCS file: /var/cvs/interchange/lib/Vend/Ship/QueryUPS.pm,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- QueryUPS.pm	30 Jun 2003 18:09:42 -0000	1.3
+++ QueryUPS.pm	30 Jun 2003 18:21:44 -0000	1.4
@@ -1,6 +1,6 @@
 # Vend::Ship::QueryUPS - Interchange shipping code
 # 
-# $Id: QueryUPS.pm,v 1.3 2003/06/30 18:09:42 mheins Exp $
+# $Id: QueryUPS.pm,v 1.4 2003/06/30 18:21:44 mheins Exp $
 #
 # Copyright (C) 2002-2003 Interchange Development Group
 # Copyright (C) 1996-2002 Red Hat, Inc.
@@ -69,7 +69,8 @@
 		# do nothing
 	}
 	elsif ($::Variable->{UPS_COUNTRY_REMAP} =~ /=/) {
-		Vend::Util::get_option_hash($::Variable->{UPS_COUNTRY_REMAP}, \%exception);
+		my $new = Vend::Util::get_option_hash($::Variable->{UPS_COUNTRY_REMAP});
+		Vend::Util::get_option_hash(\%exception, $new);
 	}
 	else {
 		Vend::Util::hash_string($::Variable->{UPS_COUNTRY_REMAP}, \%exception);