[interchange-cvs] interchange - jon modified lib/Vend/Interpolate.pm

[interchange-core@icdevgroup.org]

User:      jon
Date:      2002-10-23 16:38:50 GMT
Modified:  lib/Vend Interpolate.pm
Log:
Fix bug that, for if-loop-*, prevented regular expressions that contained
spaces from working. E.g.

[if-loop-param field1 =~ /howdy there/]

failed, while

[if-loop-param field1 =~ /howdy\sthere/]

worked.

Revision  Changes    Path
2.120     +2 -2      interchange/lib/Vend/Interpolate.pm


rev 2.120, prev_rev 2.119
Index: Interpolate.pm
===================================================================
RCS file: /var/cvs/interchange/lib/Vend/Interpolate.pm,v
retrieving revision 2.119
retrieving revision 2.120
diff -u -u -r2.119 -r2.120
--- Interpolate.pm	21 Oct 2002 15:42:11 -0000	2.119
+++ Interpolate.pm	23 Oct 2002 16:38:49 -0000	2.120
@@ -1,6 +1,6 @@
 # Vend::Interpolate - Interpret Interchange tags
 # 
-# $Id: Interpolate.pm,v 2.119 2002/10/21 15:42:11 mheins Exp $
+# $Id: Interpolate.pm,v 2.120 2002/10/23 16:38:49 jon Exp $
 #
 # Copyright (C) 1996-2002 Red Hat, Inc. <interchange@redhat.com>
 #
@@ -27,7 +27,7 @@
 require Exporter;
 @ISA = qw(Exporter);
 
-$VERSION = substr(q$Revision: 2.119 $, 10);
+$VERSION = substr(q$Revision: 2.120 $, 10);
 
 @EXPORT = qw (
 
@@ -3271,7 +3271,7 @@
 sub pull_cond {
 	my($string, $reverse, $cond, $lhs) = @_;
 #::logDebug("pull_cond string='$string' rev='$reverse' cond='$cond' lhs='$lhs'");
-	my ($op, $rhs) = split /\s+/, $cond;
+	my ($op, $rhs) = split /\s+/, $cond, 2;
 	$rhs =~ s/^(["'])(.*)\1$/$2/;
 	if(! defined $cond_op{$op} ) {
 		logError("bad conditional operator %s in if-PREFIX-data", $op);