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

[interchange-core@interchange.redhat.com]

User:      racke
Date:      2002-06-05 07:38:12 GMT
Modified:  lib/Vend Tag: STABLE_4_8-branch Order.pm
Log:
reversed Jon's patch to check status of &calc and &return because
it caused to many side effects, we keep it in devel

Revision  Changes    Path
No                   revision



No                   revision



2.6.2.9   +31 -31    interchange/lib/Vend/Order.pm


rev 2.6.2.9, prev_rev 2.6.2.8
Index: Order.pm
===================================================================
RCS file: /anon_cvs/repository/interchange/lib/Vend/Order.pm,v
retrieving revision 2.6.2.8
retrieving revision 2.6.2.9
diff -u -r2.6.2.8 -r2.6.2.9
--- Order.pm	4 Jun 2002 18:33:01 -0000	2.6.2.8
+++ Order.pm	5 Jun 2002 07:38:12 -0000	2.6.2.9
@@ -1,6 +1,6 @@
 # Vend::Order - Interchange order routing routines
 #
-# $Id: Order.pm,v 2.6.2.8 2002/06/04 18:33:01 racke Exp $
+# $Id: Order.pm,v 2.6.2.9 2002/06/05 07:38:12 racke Exp $
 #
 # Copyright (C) 1996-2002 Red Hat, Inc. <interchange@redhat.com>
 #
@@ -28,7 +28,7 @@
 package Vend::Order;
 require Exporter;
 
-$VERSION = substr(q$Revision: 2.6.2.8 $, 10);
+$VERSION = substr(q$Revision: 2.6.2.9 $, 10);
 
 @ISA = qw(Exporter);
 
@@ -845,8 +845,7 @@
 
 sub check_order {
 	my ($profile, $vref) = @_;
-	$Vend::Session->{errors} = {}
-		unless ref $Vend::Session->{errors} eq 'HASH';
+	my($codere) = '[-\w_#/.]+';
 	my $params;
 	$Profile = $profile;
 	if(defined $Vend::Cfg->{OrderProfileName}->{$profile}) {
@@ -865,6 +864,7 @@
 	}
 	return undef unless $params;
 
+	my $ref = \%CGI::values;
 	$params = interpolate_html($params);
 	$params =~ s/\\\n//g;
 	@Errors = ();
@@ -905,7 +905,7 @@
 		s/^\s+//;
 		s/\s+$//;
 		($val, $var, $message) = do_check($_, $vref);
-#::logDebug("param=$_|val=$val|var=$var|message=$message");
+		next if ! defined $var;
 		if(defined $And) {
 			if($And) {
 				$val = ($last_one && $val);
@@ -916,36 +916,36 @@
 			undef $And;
 		}
 		$last_one = $val;
-		$status = 0 unless $val;
-		if ($var) {
-			if ($val) {
-				$::Values->{"mv_status_$var"} = $message
-					if defined $message and $message;
-				delete $Vend::Session->{errors}{$var};
-				delete $::Values->{"mv_error_$var"};
-			}
-			else {
+		if ($val) {
+			$::Values->{"mv_status_$var"} = $message
+				if defined $message and $message;
+			delete $Vend::Session->{errors}{$var};
+			delete $::Values->{"mv_error_$var"};
+		}
+		else {
+			$status = 0;
 # LEGACY
-				$::Values->{"mv_error_$var"} = $message;
+			$::Values->{"mv_error_$var"} = $message;
 # END LEGACY
-				if( $No_error ) {
-					# do nothing
-				}
-				elsif( $Vend::Session->{errors}{$var} ) {
-					if ($message and $Vend::Session->{errors}{$var} !~ /\Q$message/) {
-						$Vend::Session->{errors}{$var} = errmsg(
-							'%s and %s',
-							$Vend::Session->{errors}{$var},
-							$message
-						);
-					}
-				}
-				else {
-					$Vend::Session->{errors}{$var} = $message ||
-						errmsg('%s: failed check', $var);
+			$Vend::Session->{errors} = {}
+				if ! $Vend::Session->{errors};
+			if( $No_error ) {
+				# do nothing
+			}
+			elsif( $Vend::Session->{errors}{$var} ) {
+				if ($message and $Vend::Session->{errors}{$var} !~ /\Q$message/) {
+					$Vend::Session->{errors}{$var} = errmsg(
+						'%s and %s',
+						$Vend::Session->{errors}{$var},
+						$message
+					);
 				}
-				push @Errors, "$var: $message";
 			}
+			else {
+				$Vend::Session->{errors}{$var} = $message ||
+					errmsg('%s: failed check', $var);
+			}
+			push @Errors, "$var: $message";
 		}
 		if (defined $Success) {
 			$status = $Success;