[interchange-cvs] interchange - racke modified code/OrderCheck/relative_filename.oc

[interchange-cvs at icdevgroup.org]

User:      racke
Date:      2005-11-29 20:32:53 GMT
Modified:  code/OrderCheck relative_filename.oc
Log:
merged changes 1.1 vs 1.1.2.1
+++ 1.1.2.1 +++
descriptions added, natural and relative_filename are using custom error messages now

Revision  Changes    Path
1.2       +8 -6      interchange/code/OrderCheck/relative_filename.oc


rev 1.2, prev_rev 1.1
Index: relative_filename.oc
===================================================================
RCS file: /var/cvs/interchange/code/OrderCheck/relative_filename.oc,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- relative_filename.oc	7 Oct 2005 11:38:55 -0000	1.1
+++ relative_filename.oc	29 Nov 2005 20:32:53 -0000	1.2
@@ -1,17 +1,19 @@
 # Copyright 2005 Interchange Development Group (http://www.icdevgroup.org/)
 # Licensed under the GNU GPL v2. See file LICENSE for details.
-# $Id: relative_filename.oc,v 1.1 2005/10/07 11:38:55 racke Exp $
+# $Id: relative_filename.oc,v 1.2 2005/11/29 20:32:53 racke Exp $
 
 CodeDef relative_filename OrderCheck 1
+CodeDef relative_filename Description Relative filename
 CodeDef relative_filename Routine <<EOR
 sub {
-	my ($name, $value, $code) = @_;
+	my ($ref, $name, $value, $code) = @_;
 
-	if ($code =~ /\S/ && $code !~ /^\.{1,2}$/ 
-		&& ! Vend::File::absolute_or_relative($code)) {
-		return (1, $value, '');
+	if ($value =~ /\S/ && $value !~ /^\.{1,2}$/ 
+		&& ! Vend::File::absolute_or_relative($value)) {
+		return (1, $name, '');
 	} else {
-		return (0, $value, "filename not relative");
+		$code ||= errmsg('filename not relative');
+		return (0, $name, $code);
 	}
 }
 EOR