[interchange-cvs] interchange - racke modified 9 files
interchange-cvs at icdevgroup.org
interchange-cvs at icdevgroup.org
Tue Nov 29 15:05:36 EST 2005
User: racke
Date: 2005-11-29 20:05:35 GMT
Modified: code/OrderCheck Tag: STABLE_5_4-branch email_only.oc
Modified: exists.oc filter.oc future.oc length.oc natural.oc
Modified: regex.oc relative_filename.oc unique.oc
Log:
descriptions added, natural and relative_filename are using custom error messages now
Revision Changes Path
No revision
No revision
1.1.2.1 +2 -1 interchange/code/OrderCheck/email_only.oc
rev 1.1.2.1, prev_rev 1.1
Index: email_only.oc
===================================================================
RCS file: /var/cvs/interchange/code/OrderCheck/email_only.oc,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -r1.1 -r1.1.2.1
--- email_only.oc 13 Oct 2005 20:15:05 -0000 1.1
+++ email_only.oc 29 Nov 2005 20:05:35 -0000 1.1.2.1
@@ -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: email_only.oc,v 1.1 2005/10/13 20:15:05 racke Exp $
+# $Id: email_only.oc,v 1.1.2.1 2005/11/29 20:05:35 racke Exp $
CodeDef email_only OrderCheck 1
+CodeDef email_only Description Email address
CodeDef email_only Routine <<EOR
sub {
my($ref, $var, $val) = @_;
1.1.2.1 +2 -1 interchange/code/OrderCheck/exists.oc
rev 1.1.2.1, prev_rev 1.1
Index: exists.oc
===================================================================
RCS file: /var/cvs/interchange/code/OrderCheck/exists.oc,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -r1.1 -r1.1.2.1
--- exists.oc 14 Oct 2005 07:42:50 -0000 1.1
+++ exists.oc 29 Nov 2005 20:05:35 -0000 1.1.2.1
@@ -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: exists.oc,v 1.1 2005/10/14 07:42:50 racke Exp $
+# $Id: exists.oc,v 1.1.2.1 2005/11/29 20:05:35 racke Exp $
CodeDef exists OrderCheck 1
+CodeDef exists Description Existing record
CodeDef exists Routine <<EOR
sub {
my($ref, $name, $value, $code) = @_;
1.1.2.1 +2 -1 interchange/code/OrderCheck/filter.oc
rev 1.1.2.1, prev_rev 1.1
Index: filter.oc
===================================================================
RCS file: /var/cvs/interchange/code/OrderCheck/filter.oc,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -r1.1 -r1.1.2.1
--- filter.oc 8 Nov 2005 09:50:23 -0000 1.1
+++ filter.oc 29 Nov 2005 20:05:35 -0000 1.1.2.1
@@ -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: filter.oc,v 1.1 2005/11/08 09:50:23 racke Exp $
+# $Id: filter.oc,v 1.1.2.1 2005/11/29 20:05:35 racke Exp $
CodeDef filter OrderCheck 1
+CodeDef filter Description Passes filter unchanged
CodeDef filter Routine <<EOR
sub {
my ($ref, $name, $value, $code) = @_;
1.1.2.1 +2 -1 interchange/code/OrderCheck/future.oc
rev 1.1.2.1, prev_rev 1.1
Index: future.oc
===================================================================
RCS file: /var/cvs/interchange/code/OrderCheck/future.oc,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -r1.1 -r1.1.2.1
--- future.oc 14 Oct 2005 14:18:35 -0000 1.1
+++ future.oc 29 Nov 2005 20:05:35 -0000 1.1.2.1
@@ -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: future.oc,v 1.1 2005/10/14 14:18:35 racke Exp $
+# $Id: future.oc,v 1.1.2.1 2005/11/29 20:05:35 racke Exp $
CodeDef future OrderCheck 1
+CodeDef future Description Future date
CodeDef future Routine <<EOR
sub {
my($ref, $name, $value, $code) = @_;
1.1.2.1 +2 -1 interchange/code/OrderCheck/length.oc
rev 1.1.2.1, prev_rev 1.1
Index: length.oc
===================================================================
RCS file: /var/cvs/interchange/code/OrderCheck/length.oc,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -r1.1 -r1.1.2.1
--- length.oc 14 Oct 2005 14:18:35 -0000 1.1
+++ length.oc 29 Nov 2005 20:05:35 -0000 1.1.2.1
@@ -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: length.oc,v 1.1 2005/10/14 14:18:35 racke Exp $
+# $Id: length.oc,v 1.1.2.1 2005/11/29 20:05:35 racke Exp $
CodeDef length OrderCheck 1
+CodeDef length Description String length
CodeDef length Routine <<EOR
sub {
my($ref, $name, $value, $msg) = @_;
1.1.2.1 +10 -2 interchange/code/OrderCheck/natural.oc
rev 1.1.2.1, prev_rev 1.1
Index: natural.oc
===================================================================
RCS file: /var/cvs/interchange/code/OrderCheck/natural.oc,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -r1.1 -r1.1.2.1
--- natural.oc 14 Oct 2005 14:18:35 -0000 1.1
+++ natural.oc 29 Nov 2005 20:05:35 -0000 1.1.2.1
@@ -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.1.2.1 2005/11/29 20:05:35 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
1.1.2.1 +2 -1 interchange/code/OrderCheck/regex.oc
rev 1.1.2.1, prev_rev 1.1
Index: regex.oc
===================================================================
RCS file: /var/cvs/interchange/code/OrderCheck/regex.oc,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -r1.1 -r1.1.2.1
--- regex.oc 14 Oct 2005 14:18:35 -0000 1.1
+++ regex.oc 29 Nov 2005 20:05:35 -0000 1.1.2.1
@@ -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: regex.oc,v 1.1 2005/10/14 14:18:35 racke Exp $
+# $Id: regex.oc,v 1.1.2.1 2005/11/29 20:05:35 racke Exp $
CodeDef regex OrderCheck 1
+CodeDef regex Description Regular expression match
CodeDef regex Routine <<EOR
sub {
my($ref, $name, $value, $code) = @_;
1.1.2.1 +8 -6 interchange/code/OrderCheck/relative_filename.oc
rev 1.1.2.1, 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.1.2.1
diff -u -r1.1 -r1.1.2.1
--- relative_filename.oc 7 Oct 2005 11:38:55 -0000 1.1
+++ relative_filename.oc 29 Nov 2005 20:05:35 -0000 1.1.2.1
@@ -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.1.2.1 2005/11/29 20:05:35 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
1.1.2.1 +2 -1 interchange/code/OrderCheck/unique.oc
rev 1.1.2.1, prev_rev 1.1
Index: unique.oc
===================================================================
RCS file: /var/cvs/interchange/code/OrderCheck/unique.oc,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -r1.1 -r1.1.2.1
--- unique.oc 8 Nov 2005 09:50:24 -0000 1.1
+++ unique.oc 29 Nov 2005 20:05:35 -0000 1.1.2.1
@@ -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: unique.oc,v 1.1 2005/11/08 09:50:24 racke Exp $
+# $Id: unique.oc,v 1.1.2.1 2005/11/29 20:05:35 racke Exp $
CodeDef unique OrderCheck 1
+CodeDef unique Description Unique record
CodeDef unique Routine <<EOR
sub {
my ($ref, $name, $value, $code) = @_;
More information about the interchange-cvs
mailing list