--- trunk/lib/WebPAC/Validate.pm 2006/11/03 19:41:28 768 +++ trunk/lib/WebPAC/Validate.pm 2007/05/20 16:19:16 827 @@ -18,11 +18,11 @@ =head1 VERSION -Version 0.10 +Version 0.11 =cut -our $VERSION = '0.10'; +our $VERSION = '0.11'; =head1 SYNOPSIS @@ -52,8 +52,13 @@ my $validate = new WebPAC::Validate( path => 'conf/validate/file', + delimiters => [ ' : ', ' / ', ' ; ', ' , ' ], ); +Optional parametar C will turn on validating of delimiters. Be +careful here, those delimiters are just stuck into regex, so they can +contain L regexpes. + =cut sub new { @@ -114,6 +119,11 @@ $log->info("validation uses rules from $self->{path}"); + if ( $self->{delimiters} ) { + $self->{delimiters_regex} = '(\^[a-z0-9]|' . join('|', @{ $self->{delimiters} }) . ')'; + $log->info("validation check delimiters with regex $self->{delimiters_regex}"); + } + $self ? return $self : return undef; } @@ -146,6 +156,22 @@ next if (!defined($f) || $f eq '' || $f eq '000'); + # first check delimiters + if ( my $regex = $self->{delimiters_regex} ) { + + my $template = ''; + + foreach my $v (@{ $rec->{$f} }) { + warn "## v = ", dump( $v ); + my $l = _pack_subfields_hash( $v, 1 ); + warn "## $l [$regex]\n"; + $l =~ s/$regex/$template.=$1/eg && warn "## new: $l\n"; + warn "## template: $template\n"; + $self->{_delimiters_templates}->{$f}->{$template}++; + } + + } + next if (defined( $self->{dont_validate}->{$f} )); # track field usage @@ -222,6 +248,8 @@ } } + $log->debug("_delimiters_templates = ", dump( $self->{_delimiters_templates} ) ); + foreach my $must (sort keys %{ $self->{must_exist} }) { next if ($fields->{$must}); $errors->{$must}->{missing}++;