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

interchange-cvs at icdevgroup.org interchange-cvs at icdevgroup.org
Thu May 11 08:31:53 EDT 2006


User:      heins
Date:      2006-05-11 12:31:52 GMT
Modified:  lib/Vend Tag: STABLE_5_4-branch Page.pm
Log:
* Allow numerals in all but first position in unpack output areas.

Revision  Changes    Path
No                   revision



No                   revision



2.21.2.1  +6 -6      interchange/lib/Vend/Page.pm


rev 2.21.2.1, prev_rev 2.21
Index: Page.pm
===================================================================
RCS file: /var/cvs/interchange/lib/Vend/Page.pm,v
retrieving revision 2.21
retrieving revision 2.21.2.1
diff -u -r2.21 -r2.21.2.1
--- Page.pm	8 Nov 2005 18:14:45 -0000	2.21
+++ Page.pm	11 May 2006 12:31:52 -0000	2.21.2.1
@@ -1,6 +1,6 @@
 # Vend::Page - Handle Interchange page routing
 # 
-# $Id: Page.pm,v 2.21 2005/11/08 18:14:45 jon Exp $
+# $Id: Page.pm,v 2.21.2.1 2006/05/11 12:31:52 mheins Exp $
 #
 # Copyright (C) 2002-2005 Interchange Development Group
 # Copyright (C) 1996-2002 Red Hat, Inc.
@@ -46,7 +46,7 @@
 
 use vars qw/$VERSION/;
 
-$VERSION = substr(q$Revision: 2.21 $, 10);
+$VERSION = substr(q$Revision: 2.21.2.1 $, 10);
 
 my $wantref = 1;
 
@@ -274,7 +274,7 @@
 #::logDebug("Templatizing, template length=" . length($template));
 	my $body = $template;
 
-	$body =~ s!\{\{\@([A-Z][A-Z_]*[A-Z])\}\}(.*?)\{\{/\@\1\}\}!
+	$body =~ s!\{\{\@([A-Z][A-Z_0-9]*[A-Z0-9])\}\}(.*?)\{\{/\@\1\}\}!
 					my $tag = lc $1;
 					my $ary;
 					return '' unless $ary = $Vend::OutPtr{$tag};
@@ -290,9 +290,9 @@
 					}
 					$out;
 				!sge;
-	1 while $body =~ s!\{\{([A-Z][A-Z_]*[A-Z])\?\}\}(.*?)\{\{/\1\?\}\}! output_test(lc $1) ? $2 : ''!egs;
-	1 while $body =~ s!\{\{([A-Z][A-Z_]*[A-Z])\:\}\}(.*?)\{\{/\1\:\}\}! output_test(lc $1) ? '' : $2!egs;
-	$body =~ s!\{\{([A-Z][A-Z_]*[A-Z])\}\}!output_cat($1)!eg;
+	1 while $body =~ s!\{\{([A-Z][A-Z_0-9]*[A-Z0-9])\?\}\}(.*?)\{\{/\1\?\}\}! output_test(lc $1) ? $2 : ''!egs;
+	1 while $body =~ s!\{\{([A-Z][A-Z_0-9]*[A-Z0-9])\:\}\}(.*?)\{\{/\1\:\}\}! output_test(lc $1) ? '' : $2!egs;
+	$body =~ s!\{\{([A-Z][A-Z_0-9]*[A-Z0-9])\}\}!output_cat($1)!eg;
 	$body =~ s!\{\{:DEFAULT\}\}!output_cat('')!e;
 	$body =~ s!\{\{:REST\}\}!output_rest('')!e;
 	@Vend::Output = (\$body);








More information about the interchange-cvs mailing list