[interchange-cvs] interchange - thunder modified 2 files

[interchange-cvs at icdevgroup.org]

User:      thunder
Date:      2009-02-10 12:16:49 GMT
Modified:  code/SystemTag error.coretag
Modified:  .        WHATSNEW-5.7
Log:
The error is now not anymore automatically appended to the output of [error] when MV_ERROR_STD_LABEL has a value.

Revision  Changes    Path
1.11                 interchange/code/SystemTag/error.coretag


rev 1.11, prev_rev 1.10
Index: error.coretag
===================================================================
RCS file: /var/cvs/interchange/code/SystemTag/error.coretag,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- error.coretag	11 Apr 2008 06:30:46 -0000	1.10
+++ error.coretag	10 Feb 2009 12:16:49 -0000	1.11
@@ -5,14 +5,14 @@
 # the Free Software Foundation; either version 2 of the License, or
 # (at your option) any later version.  See the LICENSE file for details.
 # 
-# $Id: error.coretag,v 1.10 2008-04-11 06:30:46 danb Exp $
+# $Id: error.coretag,v 1.11 2009-02-10 12:16:49 thunder Exp $
 
 ### This is in package Vend::Interpolate, and may make reference
 ### to variables in that module
 UserTag error               Order        name
 UserTag error               addAttr
 UserTag error               PosNumber    1
-UserTag error               Version      $Revision: 1.10 $
+UserTag error               Version      $Revision: 1.11 $
 UserTag error               Routine      <<EOR
 sub set_error {
 	my ($error, $var, $opt) = @_;
@@ -141,7 +141,9 @@
 		$err =~ s/\s+$//;
 	}
 	$text = '' unless defined $text;
-	$text .= '%s' unless $text =~ /\%s/;
+	$text .= '%s' unless ($text =~ /\%s/ ||
+                                length $::Variable->{MV_ERROR_STD_LABEL});
+
 	$text = pull_else($text, $found_error);
 	$text =~ s/\%s/$err/;
 	return $text;



2.27                 interchange/WHATSNEW-5.7


rev 2.27, prev_rev 2.26
Index: WHATSNEW-5.7
===================================================================
RCS file: /var/cvs/interchange/WHATSNEW-5.7,v
retrieving revision 2.26
retrieving revision 2.27
diff -u -r2.26 -r2.27
--- WHATSNEW-5.7	29 Jan 2009 10:47:40 -0000	2.26
+++ WHATSNEW-5.7	10 Feb 2009 12:16:49 -0000	2.27
@@ -40,6 +40,14 @@
 * Added empty attribute for [convert-date] to display a custom string
   instead of the current date when no proper date is passed.
 
+
+SystemTag
+---------
+
+* The error is now not anymore automatically appended to the output of [error]
+  when MV_ERROR_STD_LABEL has a value.
+
+
 Checks
 ------