[interchange-cvs] interchange - racke modified 5 files

[interchange-cvs at icdevgroup.org]

User:      racke
Date:      2004-10-29 13:20:19 GMT
Modified:  code/Filter encode_entities.filter lc.filter uc.filter
Modified:  lib/Vend Config.pm Interpolate.pm
Log:
moved filter aliases to corresponding filter files, use similar
syntax as usertag aliases

Revision  Changes    Path
1.2       +7 -1      interchange/code/Filter/encode_entities.filter


rev 1.2, prev_rev 1.1
Index: encode_entities.filter
===================================================================
RCS file: /anon_cvs/repository/interchange/code/Filter/encode_entities.filter,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- encode_entities.filter	19 Oct 2004 10:03:51 -0000	1.1
+++ encode_entities.filter	29 Oct 2004 13:20:18 -0000	1.2
@@ -1,7 +1,13 @@
 # Copyright 2002-2004 Interchange Development Group (http://www.icdevgroup.org/)
 # Copyright 1996-2002 Red Hat, Inc.
 # Licensed under the GNU GPL v2. See file LICENSE for details.
-# $Id: encode_entities.filter,v 1.1 2004/10/19 10:03:51 docelic Exp $
+# $Id: encode_entities.filter,v 1.2 2004/10/29 13:20:18 racke Exp $
+
+CodeDef e Filter
+CodeDef e Alias encode_entities
+
+CodeDef entities Filter
+CodeDef entities Alias encode_entities
 
 CodeDef encode_entities Filter
 CodeDef encode_entities Routine <<EOR



1.3       +4 -1      interchange/code/Filter/lc.filter


rev 1.3, prev_rev 1.2
Index: lc.filter
===================================================================
RCS file: /anon_cvs/repository/interchange/code/Filter/lc.filter,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- lc.filter	19 Oct 2004 10:03:51 -0000	1.2
+++ lc.filter	29 Oct 2004 13:20:18 -0000	1.3
@@ -1,7 +1,10 @@
 # Copyright 2002-2004 Interchange Development Group (http://www.icdevgroup.org/)
 # Copyright 1996-2002 Red Hat, Inc.
 # Licensed under the GNU GPL v2. See file LICENSE for details.
-# $Id: lc.filter,v 1.2 2004/10/19 10:03:51 docelic Exp $
+# $Id: lc.filter,v 1.3 2004/10/29 13:20:18 racke Exp $
+
+CodeDef lower Filter
+CodeDef lower Alias lc
 
 CodeDef lc Filter
 CodeDef lc Routine <<EOR



1.2       +4 -1      interchange/code/Filter/uc.filter


rev 1.2, prev_rev 1.1
Index: uc.filter
===================================================================
RCS file: /anon_cvs/repository/interchange/code/Filter/uc.filter,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- uc.filter	19 Oct 2004 10:03:51 -0000	1.1
+++ uc.filter	29 Oct 2004 13:20:18 -0000	1.2
@@ -1,7 +1,10 @@
 # Copyright 2002-2004 Interchange Development Group (http://www.icdevgroup.org/)
 # Copyright 1996-2002 Red Hat, Inc.
 # Licensed under the GNU GPL v2. See file LICENSE for details.
-# $Id: uc.filter,v 1.1 2004/10/19 10:03:51 docelic Exp $
+# $Id: uc.filter,v 1.2 2004/10/29 13:20:18 racke Exp $
+
+CodeDef upper Filter
+CodeDef upper Alias uc
 
 CodeDef uc Filter
 CodeDef uc Routine <<EOR



2.149     +4 -5      interchange/lib/Vend/Config.pm


rev 2.149, prev_rev 2.148
Index: Config.pm
===================================================================
RCS file: /anon_cvs/repository/interchange/lib/Vend/Config.pm,v
retrieving revision 2.148
retrieving revision 2.149
diff -u -r2.148 -r2.149
--- Config.pm	26 Oct 2004 12:36:39 -0000	2.148
+++ Config.pm	29 Oct 2004 13:20:18 -0000	2.149
@@ -1,6 +1,6 @@
 # Vend::Config - Configure Interchange
 #
-# $Id: Config.pm,v 2.148 2004/10/26 12:36:39 racke Exp $
+# $Id: Config.pm,v 2.149 2004/10/29 13:20:18 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.148 $, 10);
+$VERSION = substr(q$Revision: 2.149 $, 10);
 
 my %CDname;
 my %CPname;
@@ -3749,9 +3749,8 @@
 		}
 		if ($ref = $typeref->{Alias}) {
 			for(keys %$ref) {
-				
-				if (exists $Vend::Interpolate::Filter{$_}) {
-					$Vend::Interpolate::Filter{$ref->{$_}} = $Vend::Interpolate::Filter{$_};
+				if (exists $Vend::Interpolate::Filter{$ref->{$_}}) {
+					$Vend::Interpolate::Filter{$_} = $Vend::Interpolate::Filter{$ref->{$_}};
 				}
 			}
 		}



2.226     +2 -7      interchange/lib/Vend/Interpolate.pm


rev 2.226, prev_rev 2.225
Index: Interpolate.pm
===================================================================
RCS file: /anon_cvs/repository/interchange/lib/Vend/Interpolate.pm,v
retrieving revision 2.225
retrieving revision 2.226
diff -u -r2.225 -r2.226
--- Interpolate.pm	29 Oct 2004 05:02:01 -0000	2.225
+++ Interpolate.pm	29 Oct 2004 13:20:18 -0000	2.226
@@ -1,6 +1,6 @@
 # Vend::Interpolate - Interpret Interchange tags
 # 
-# $Id: Interpolate.pm,v 2.225 2004/10/29 05:02:01 danb Exp $
+# $Id: Interpolate.pm,v 2.226 2004/10/29 13:20:18 racke Exp $
 #
 # Copyright (C) 2002-2003 Interchange Development Group
 # Copyright (C) 1996-2002 Red Hat, Inc.
@@ -28,7 +28,7 @@
 require Exporter;
 @ISA = qw(Exporter);
 
-$VERSION = substr(q$Revision: 2.225 $, 10);
+$VERSION = substr(q$Revision: 2.226 $, 10);
 
 @EXPORT = qw (
 
@@ -872,11 +872,6 @@
 	#The most common , don't enter a block, no accoutrements
 	return ed(database_field($selector,$key,$field,$opt->{foreign}));
 }
-
-$Filter{upper} = $Filter{uc};
-$Filter{lower} = $Filter{lc};
-$Filter{entities} = $Filter{encode_entities};
-$Filter{e} = $Filter{encode_entities};
 
 sub input_filter_do {
 	my($varname, $opt, $routine) = @_;