[interchange-cvs] interchange - pajamian modified 2 files

interchange-cvs at icdevgroup.org interchange-cvs at icdevgroup.org
Thu Jul 5 08:58:48 EDT 2007


User:      pajamian
Date:      2007-07-05 12:58:48 GMT
Modified:  .        WHATSNEW-5.5
Modified:  lib/Vend Parse.pm
Log:
Fixed error where the wrong tag name can sometimes appear in [calc] error messages (#7).

Revision  Changes    Path
1.36      +5 -2      interchange/WHATSNEW-5.5


rev 1.36, prev_rev 1.35
Index: WHATSNEW-5.5
===================================================================
RCS file: /var/cvs/interchange/WHATSNEW-5.5,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- WHATSNEW-5.5	5 Jul 2007 11:48:37 -0000	1.35
+++ WHATSNEW-5.5	5 Jul 2007 12:58:48 -0000	1.36
@@ -63,9 +63,12 @@
 * New "timecard" round-robin style counters added with the timecard_stamp and
   timecard_read subs in Util.pm.  These are now used for better control of the
   session per IP lockouts (when RobotLimit is set).  See CVS log for more
-  details.
+  details (#2).
 
-* lockout specialsubs will now override session per IP lockouts properly.
+* lockout specialsubs will now override session per IP lockouts properly (#3).
+
+* Fixed error where the wrong tag name can sometimes appear in [calc] error
+  messages (#7).
 
 UserDB
 ------



2.39      +4 -2      interchange/lib/Vend/Parse.pm


rev 2.39, prev_rev 2.38
Index: Parse.pm
===================================================================
RCS file: /var/cvs/interchange/lib/Vend/Parse.pm,v
retrieving revision 2.38
retrieving revision 2.39
diff -u -r2.38 -r2.39
--- Parse.pm	30 Mar 2007 11:39:45 -0000	2.38
+++ Parse.pm	5 Jul 2007 12:58:48 -0000	2.39
@@ -1,6 +1,6 @@
 # Vend::Parse - Parse Interchange tags
 # 
-# $Id: Parse.pm,v 2.38 2007/03/30 11:39:45 pajamian Exp $
+# $Id: Parse.pm,v 2.39 2007/07/05 12:58:48 pajamian Exp $
 #
 # Copyright (C) 2002-2005 Interchange Development Group
 # Copyright (C) 1996-2002 Red Hat, Inc.
@@ -36,7 +36,7 @@
 
 @ISA = qw(Exporter Vend::Parser);
 
-$VERSION = substr(q$Revision: 2.38 $, 10);
+$VERSION = substr(q$Revision: 2.39 $, 10);
 
 @EXPORT = ();
 @EXPORT_OK = qw(find_matching_end);
@@ -816,7 +816,9 @@
 #::logDebug("FOUND end for $tag\nBuf " . length($$buf) . ":\n" . $$buf . "\nTmpbuf:\n$tmpbuf\n");
 		if ($attr->{interpolate} and !$empty_container) {
 			my $p = new Vend::Parse;
+			my $tagsave = $Vend::CurrentTag;
 			$p->parse($tmpbuf);
+			$Vend::CurrentTag = $tagsave;
 			$tmpbuf = $p->{ABORT} ? '' : ${$p->{OUT}};
 		}
 		if($attr->{reparse} ) {








More information about the interchange-cvs mailing list