[interchange-cvs] interchange - kwalsh modified 2 files

[interchange-cvs at icdevgroup.org]

User:      kwalsh
Date:      2007-08-20 23:57:34 GMT
Modified:  .        WHATSNEW-5.5
Modified:  lib/Vend Interpolate.pm
Log:
    * Added a new "scratchd" test type.  This is the same as "scratch"
      except that it deletes the variable from the scratchpad after
      testing.

Revision  Changes    Path
1.61      +3 -0      interchange/WHATSNEW-5.5


rev 1.61, prev_rev 1.60
Index: WHATSNEW-5.5
===================================================================
RCS file: /var/cvs/interchange/WHATSNEW-5.5,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- WHATSNEW-5.5	20 Aug 2007 21:42:21 -0000	1.60
+++ WHATSNEW-5.5	20 Aug 2007 23:57:34 -0000	1.61
@@ -132,6 +132,9 @@
 
 * Removed MV_DOLLAR_ZERO workaround for a bug fixed 5 years ago.
 
+* Added a new "scratchd" test type.  This is the same as "scratch" except
+  that it deletes the variable from the scratchpad after testing.
+
 UserDB
 ------
 



2.284     +9 -2      interchange/lib/Vend/Interpolate.pm


rev 2.284, prev_rev 2.283
Index: Interpolate.pm
===================================================================
RCS file: /var/cvs/interchange/lib/Vend/Interpolate.pm,v
retrieving revision 2.283
retrieving revision 2.284
diff -u -r2.283 -r2.284
--- Interpolate.pm	10 Aug 2007 08:41:22 -0000	2.283
+++ Interpolate.pm	20 Aug 2007 23:57:34 -0000	2.284
@@ -1,6 +1,6 @@
 # Vend::Interpolate - Interpret Interchange tags
 # 
-# $Id: Interpolate.pm,v 2.283 2007/08/10 08:41:22 thunder Exp $
+# $Id: Interpolate.pm,v 2.284 2007/08/20 23:57:34 kwalsh 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.283 $, 10);
+$VERSION = substr(q$Revision: 2.284 $, 10);
 
 @EXPORT = qw (
 
@@ -976,6 +976,13 @@
 		$op = "q{$op}" unless defined $noop;
 		$op .=	qq%	$operator $comp%
 				if defined $comp;
+	}
+	elsif($base eq 'scratchd') {
+		$op =	qq%$::Scratch->{$term}%;
+		$op = "q{$op}" unless defined $noop;
+		$op .=	qq%	$operator $comp%
+				if defined $comp;
+		delete $::Scratch->{$term};
 	}
 	elsif($base =~ /^value/) {
 		$op =	qq%$::Values->{$term}%;