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

[interchange-cvs at icdevgroup.org]

User:      racke
Date:      2005-11-29 20:32:05 GMT
Modified:  code/OrderCheck natural.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       +10 -2     interchange/code/OrderCheck/natural.oc


rev 1.2, prev_rev 1.1
Index: natural.oc
===================================================================
RCS file: /var/cvs/interchange/code/OrderCheck/natural.oc,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- natural.oc	14 Oct 2005 14:18:35 -0000	1.1
+++ natural.oc	29 Nov 2005 20:32:05 -0000	1.2
@@ -1,8 +1,9 @@
 # Copyright 2005 Interchange Development Group (http://www.icdevgroup.org/)
 # Licensed under the GNU GPL v2. See file LICENSE for details.
-# $Id: natural.oc,v 1.1 2005/10/14 14:18:35 racke Exp $
+# $Id: natural.oc,v 1.2 2005/11/29 20:32:05 racke Exp $
 
 CodeDef natural OrderCheck
+CodeDef natural Description Natural number
 CodeDef natural Routine <<EOR
 sub {
 	my ($ref, $name, $value, $code) = @_;
@@ -11,7 +12,14 @@
 		return (1, $name, '');
 	}
 
-	return (0, $name, 'no natural number');
+	$code =~ s/\\/\\\\/g;
+	$code =~ s/^\s*(["'])(.+?)\1$/$2/;
+	
+	if ($code =~ /\S/) {
+		return (0, $name, $code);
+	} else {
+		return (0, $name, 'no natural number');
+	}
 }
 EOR