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

[interchange-cvs at icdevgroup.org]

User:      racke
Date:      2004-10-26 12:36:39 GMT
Modified:  lib/Vend Config.pm
Log:
introduce aliases for global filters and remove dubious next

Revision  Changes    Path
2.148     +13 -7     interchange/lib/Vend/Config.pm


rev 2.148, prev_rev 2.147
Index: Config.pm
===================================================================
RCS file: /anon_cvs/repository/interchange/lib/Vend/Config.pm,v
retrieving revision 2.147
retrieving revision 2.148
diff -u -r2.147 -r2.148
--- Config.pm	15 Oct 2004 18:35:02 -0000	2.147
+++ Config.pm	26 Oct 2004 12:36:39 -0000	2.148
@@ -1,6 +1,6 @@
 # Vend::Config - Configure Interchange
 #
-# $Id: Config.pm,v 2.147 2004/10/15 18:35:02 racke Exp $
+# $Id: Config.pm,v 2.148 2004/10/26 12:36:39 racke Exp $
 #
 # Copyright (C) 2002-2003 Interchange Development Group
 # Copyright (C) 1996-2002 Red Hat, Inc.
@@ -48,7 +48,7 @@
 use Vend::File;
 use Vend::Data;
 
-$VERSION = substr(q$Revision: 2.147 $, 10);
+$VERSION = substr(q$Revision: 2.148 $, 10);
 
 my %CDname;
 my %CPname;
@@ -3741,16 +3741,22 @@
 
 sub finalize_mapped_code {
 	my $c = $C ? $C->{CodeDef} : $Global::CodeDef;
-	my $ref;
-	my $cfg;
+	my ($typeref, $ref, $cfg);
 
-	if(! $C and my $ref = $c->{Filter}) {
-		next unless $ref = $ref->{Routine};
+	if(! $C && ($typeref = $c->{Filter}) && ($ref = $typeref->{Routine})) {
 		for(keys %$ref) {
 			$Vend::Interpolate::Filter{$_} = $ref->{$_};
 		}
+		if ($ref = $typeref->{Alias}) {
+			for(keys %$ref) {
+				
+				if (exists $Vend::Interpolate::Filter{$_}) {
+					$Vend::Interpolate::Filter{$ref->{$_}} = $Vend::Interpolate::Filter{$_};
+				}
+			}
+		}
 	}
-
+	
 	no strict 'refs';
 	for my $type (qw/ ActionMap FormAction ItemAction OrderCheck /) {
 		my $ref;