[interchange-cvs] interchange - racke modified lib/Vend/Order.pm

[interchange-core@interchange.redhat.com]

User:      racke
Date:      2001-09-28 15:17:08 GMT
Modified:  lib/Vend Order.pm
Log:
merged changes 2.6.2.1 vs 2.6.2.2

Revision  Changes    Path
2.8       +11 -5     interchange/lib/Vend/Order.pm


rev 2.8, prev_rev 2.7
Index: Order.pm
===================================================================
RCS file: /anon_cvs/repository/interchange/lib/Vend/Order.pm,v
retrieving revision 2.7
retrieving revision 2.8
diff -u -r2.7 -r2.8
--- Order.pm	2001/09/19 09:26:35	2.7
+++ Order.pm	2001/09/28 15:17:08	2.8
@@ -1,6 +1,6 @@
 # Vend::Order - Interchange order routing routines
 #
-# $Id: Order.pm,v 2.7 2001/09/19 09:26:35 racke Exp $
+# $Id: Order.pm,v 2.8 2001/09/28 15:17:08 racke Exp $
 #
 # Copyright (C) 1996-2001 Red Hat, Inc. <interchange@redhat.com>
 #
@@ -28,7 +28,7 @@
 package Vend::Order;
 require Exporter;
 
-$VERSION = substr(q$Revision: 2.7 $, 10);
+$VERSION = substr(q$Revision: 2.8 $, 10);
 
 @ISA = qw(Exporter);
 
@@ -1451,12 +1451,14 @@
 		elsif($route->{increment}) {
 			$::Values->{mv_order_number} = counter_number();
 		}
+		my $pagefile;
 		my $page;
 		if($route->{empty} and ! $route->{report}) {
 			$page = '';
 		}
 		else {
-			$page = readfile($route->{'report'} || $main->{'report'});
+			$pagefile = $route->{'report'} || $main->{'report'};
+			$page = readfile($pagefile);
 		}
 		die errmsg(
 			"No order report %s or %s found.",
@@ -1470,8 +1472,12 @@
 			$::Values->{mv_credit_card_info}
 				=~ s/^(\s*\w+\s+)(\d\d)[\d ]+(\d\d\d\d)/$1$2 NEED ENCRYPTION $3/;
 		}
-		$page = interpolate_html($page) if $page;
-
+		eval {
+			$page = interpolate_html($page) if $page;
+		};
+		if ($@) {
+			die "Error while interpolating page $pagefile:\n $@";
+		}
 		$use_mime   = $::Instance->{MIME} || undef;
 		$::Instance->{MIME} = $save_mime  || undef;