use base 'WebPAC::Common';
use File::Slurp;
use List::Util qw/first/;
-use Data::Dumper;
+use Data::Dump qw/dump/;
use WebPAC::Normalize qw/_pack_subfields_hash/;
use Storable qw/dclone/;
=head1 VERSION
-Version 0.04
+Version 0.07
=cut
-our $VERSION = '0.04';
+our $VERSION = '0.07';
=head1 SYNOPSIS
}
- $log->debug("current validation rules: ", Dumper($v));
+ $log->debug("current validation rules: ", dump($v));
$self->{rules} = $v;
Validate record and return errors
- my @errors = $validate->validate_errors( $rec );
+ my @errors = $validate->validate_errors( $rec, $rec_dump );
=cut
my $log = $self->_get_logger();
my $rec = shift || $log->logdie("validate_errors need record");
+ my $rec_dump = shift;
$log->logdie("rec isn't HASH") unless (ref($rec) eq 'HASH');
$log->logdie("can't find validation rules") unless (my $r = $self->{rules});
- my @errors;
+ my $errors;
- $log->debug("rec = ", sub { Dumper($rec) }, "keys = ", keys %{ $rec });
+ $log->debug("rec = ", sub { dump($rec) }, "keys = ", keys %{ $rec });
my $fields;
$fields->{$f}++;
if ( ! defined($r->{$f}) ) {
- push @errors, "field '$f' shouldn't exists";
+ $errors->{field}->{ $f }->{unexpected} = "this field is not expected";
next;
}
if (ref($rec->{$f}) ne 'ARRAY') {
- push @errors, "field '$f' isn't repetable, probably bug in parsing input data";
+ $errors->{field}->{ $f }->{not_repeatable} = "probably bug in parsing input data";
next;
}
# can we have subfields?
if (ref($r->{$f}) eq 'ARRAY') {
# are values hashes? (has subfields)
- if (ref($v) ne 'HASH') {
- push @errors, "$f has value without subfields: $v";
+ if (! defined($v)) {
+# $errors->{field}->{$f}->{empty} = undef;
+# $errors->{dump} = $rec_dump if ($rec_dump);
+ } elsif (ref($v) ne 'HASH') {
+ $errors->{field}->{$f}->{missing_subfield} = join(",", @{ $r->{$f} }) . " required";
next;
} else {
$sf_repeatable->{$sf}++;
};
if (! first { $_ eq $sf } @{ $r->{$f} }) {
- push @errors, "$f has unknown subfield: $sf";
+ $errors->{field}->{ $f }->{subfield}->{extra}->{$sf}++;
}
}
}
if (my @r_sf = sort keys( %$sf_repeatable )) {
- my $plural = $#r_sf > 0 ? 1 : 0;
-
- push @errors, "$f subfield" .
- ( $plural ? 's ' : ' ' ) .
- join(', ', @r_sf) .
- ( $plural ? ' are ' : ' is ' ) .
- 'repeatable in: ' .
- join('', _pack_subfields_hash( $h, 1) );
+
+ foreach my $sf (@r_sf) {
+ $errors->{field}->{$f}->{subfield}->{extra_repeatable}->{$sf}++;
+ $errors->{field}->{$f}->{dump} =
+ join('', _pack_subfields_hash( $h, 1 ) );
+ }
+
}
if ( defined( $self->{must_exist_sf}->{$f} ) ) {
foreach my $sf (sort keys %{ $self->{must_exist_sf}->{$f} }) {
-warn "====> $f $sf must exist\n";
- push @errors, "$f missing required subfield $sf"
- unless (
- defined( $subfields->{$f} ) &&
- defined( $subfields->{$f}->{$sf} )
- )
+#warn "====> $f $sf must exist\n";
+ $errors->{field}->{$f}->{subfield}->{missing}->{$sf}++
+ unless defined( $subfields->{$sf} );
}
}
}
} elsif (ref($v) eq 'HASH') {
- push @errors, "$f has subfields which is not valid";
+ $errors->{field}->{$f}->{unexpected_subfields}++;
+ $errors->{field}->{$f}->{dump} =
+ join('', _pack_subfields_hash( $v, 1 ) );
}
}
}
foreach my $must (sort keys %{ $self->{must_exist} }) {
next if ($fields->{$must});
- push @errors,
- "field $must should exist, but it doesn't";
+ $errors->{field}->{$must}->{missing}++;
+ $errors->{dump} = $rec_dump if ($rec_dump);
+ }
+
+ if ($errors) {
+ $log->debug("errors: ", sub { dump( $errors ) } );
+
+ my $mfn = $rec->{'000'}->[0] || $log->logconfess("record ", dump( $rec ), " doesn't have MFN");
+ $self->{errors}->{$mfn} = $errors;
}
#$log->logcluck("return from this function is ARRAY") unless wantarray;
- $log->debug("errors: ", join(", ", @errors)) if (@errors);
+ return $errors;
+}
+
+=head2 reset_errors
+
+Clean all accumulated errors for this input
+
+ $validate->reset_errors;
+
+=cut
+
+sub reset_errors {
+ my $self = shift;
+ delete ($self->{errors});
+}
+
+=head2 all_errors
+
+Return hash with all errors
+
+ print dump( $validate->all_errors );
+
+=cut
+
+sub all_errors {
+ my $self = shift;
+ return $self->{errors};
+}
+
+=head2 report
+
+Produce nice humanly readable report of errors
+
+ print $validate->report;
+
+=cut
+
+sub report {
+ my $self = shift;
+
+ my $log = $self->_get_logger();
+
+ sub unroll {
+ my ($tree, $accumulated) = @_;
+
+ $log->debug("# ",
+ ( $tree ? "tree: $tree " : '' ),
+ ( $accumulated ? "accumulated: $accumulated " : '' ),
+ );
+
+ my $results;
+
+ if (ref($tree) ne 'HASH') {
+ return ("$accumulated\t($tree)", undef);
+ }
+
+ my $dump;
+
+ foreach my $k (sort keys %{ $tree }) {
+
+ if ($k eq 'dump') {
+ $dump = $tree->{dump};
+ warn "## dump: $dump\n";
+ next;
+ }
+
+ $log->debug("current: $k");
+
+ my ($new_results, $new_dump) = unroll($tree->{$k},
+ $accumulated ? "$accumulated\t$k" : $k
+ );
+
+ $log->debug(
+ ( $new_results ? "new_results: " . dump($new_results) ." " : '' ),
+ );
+
+ push @$results, $new_results if ($new_results);
+ $dump = $new_dump if ($new_dump);
+
+ }
+
+ $log->debug(
+ ( $results ? "results: " . dump($results) ." " : '' ),
+ );
+
+ if ($#$results == 0) {
+ return ($results->[0], $dump);
+ } else {
+ return ($results, $dump);
+ }
+ }
+
+ my $out = '';
+ my $e = $self->{errors} || return;
+
+ foreach my $mfn (sort keys %$e) {
+ my ($r, $d) = unroll( $e->{$mfn} );
+ $out .= "MFN $mfn\n", dump($r), "\t$d\n\n";
+ }
- return @errors;
+ return $out;
}
=head1 AUTHOR