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

interchange-cvs at icdevgroup.org interchange-cvs at icdevgroup.org
Wed Nov 14 19:29:40 EST 2007


User:      jon
Date:      2007-11-15 00:29:39 GMT
Modified:  lib/Vend Interpolate.pm
Log:
Correct output of value-extended after successful file write.

The docs here:

http://www.icdevgroup.org/interchange-doc-5.2.0/frames/ictags_121.html

state, and it makes intuitive sense, that Perly true should be returned when
a file is successfully written. This was not the case before.

Also use earlier-set lexicals to avoid repeating the fallback to ''.

Thanks to Spencer Christensen <schristensen at backcountry.com> for the patch.

Revision  Changes    Path
2.291     +5 -5      interchange/lib/Vend/Interpolate.pm


rev 2.291, prev_rev 2.290
Index: Interpolate.pm
===================================================================
RCS file: /var/cvs/interchange/lib/Vend/Interpolate.pm,v
retrieving revision 2.290
retrieving revision 2.291
diff -u -u -r2.290 -r2.291
--- Interpolate.pm	6 Nov 2007 10:58:26 -0000	2.290
+++ Interpolate.pm	15 Nov 2007 00:29:39 -0000	2.291
@@ -1,6 +1,6 @@
 # Vend::Interpolate - Interpret Interchange tags
 # 
-# $Id: Interpolate.pm,v 2.290 2007/11/06 10:58:26 kwalsh Exp $
+# $Id: Interpolate.pm,v 2.291 2007/11/15 00:29:39 jon Exp $
 #
 # Copyright (C) 2002-2007 Interchange Development Group
 # Copyright (C) 1996-2002 Red Hat, Inc.
@@ -28,7 +28,7 @@
 require Exporter;
 @ISA = qw(Exporter);
 
-$VERSION = substr(q$Revision: 2.290 $, 10);
+$VERSION = substr(q$Revision: 2.291 $, 10);
 
 @EXPORT = qw (
 
@@ -2305,12 +2305,12 @@
 				length($CGI::file{$var}),
 				$opt->{maxsize},
 			);
-			return $opt->{no} || '';
+			return $no;
 		}
 #::logDebug(">$file \$CGI::file{$var}" . uneval($opt)); 
 		Vend::Util::writefile(">$file", \$CGI::file{$var}, $opt)
-			and return $opt->{yes} || '';
-		return $opt->{'no'} || '';
+			and return $yes;
+		return $no;
 	}
 
 	my $joiner;








More information about the interchange-cvs mailing list