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

[interchange-core@icdevgroup.org]

User:      heins
Date:      2002-08-01 16:45:05 GMT
Modified:  lib/Vend Interpolate.pm
Log:
* Handle nested {KEY?} {KEY?}.

Revision  Changes    Path
2.94      +4 -4      interchange/lib/Vend/Interpolate.pm


rev 2.94, prev_rev 2.93
Index: Interpolate.pm
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /anon_cvs/repository/interchange/lib/Vend/Interpolate.pm,v
retrieving revision 2.93
retrieving revision 2.94
diff -u -r2.93 -r2.94
--- Interpolate.pm	28 Jul 2002 05:44:24 -0000	2.93
+++ Interpolate.pm	1 Aug 2002 16:45:02 -0000	2.94
@@ -1,6 +1,6 @@
 # Vend::Interpolate - Interpret Interchange tags
 #=20
-# $Id: Interpolate.pm,v 2.93 2002/07/28 05:44:24 mheins Exp $
+# $Id: Interpolate.pm,v 2.94 2002/08/01 16:45:02 mheins Exp $
 #
 # Copyright (C) 1996-2002 Red Hat, Inc. <interchange@redhat.com>
 #
@@ -27,7 +27,7 @@
 require Exporter;
 @ISA =3D qw(Exporter);
=20
-$VERSION =3D substr(q$Revision: 2.93 $, 10);
+$VERSION =3D substr(q$Revision: 2.94 $, 10);
=20
 @EXPORT =3D qw (
=20
@@ -4080,8 +4080,8 @@
 			  !eg;
 	$body =3D~ s!\{($Codere)\|($Some)\}!$hash->{$1} || $2!eg;
 	$body =3D~ s!\{($Codere)\s+($Some)\}! $hash->{$1} ? $2 : ''!eg;
-	$body =3D~ s!\{($Codere)\?\}($Some){/\1\?\}! $hash->{$1} ? $2 : ''!eg;
-	$body =3D~ s!\{($Codere)\:\}($Some){/\1\:\}! $hash->{$1} ? '' : $2!eg;
+	1 while $body =3D~ s!\{($Codere)\?\}($Some){/\1\?\}! $hash->{$1} ? $2 : '=
'!eg;
+	1 while $body =3D~ s!\{($Codere)\:\}($Some){/\1\:\}! $hash->{$1} ? '' : $=
2!eg;
 	$body =3D~ s!\{(\w+)\:+(\w+)\:+(.*?)\}! tag_data($1, $2, $3) !eg;
 	return $body;
 }