--- trunk/lib/WebPAC/Validate.pm	2006/09/11 11:57:30	665
+++ trunk/lib/WebPAC/Validate.pm	2006/11/03 19:41:28	768
@@ -18,11 +18,11 @@
 
 =head1 VERSION
 
-Version 0.07
+Version 0.10
 
 =cut
 
-our $VERSION = '0.07';
+our $VERSION = '0.10';
 
 =head1 SYNOPSIS
 
@@ -41,6 +41,8 @@
   205! a
   # while 210 can have a c or d
   210 a c d
+  # field which is ignored in validation
+  999-
 
 =head1 FUNCTIONS
 
@@ -86,6 +88,8 @@
 
 		if ($fld =~ s/!$//) {
 			$self->{must_exist}->{$fld}++;
+		} elsif ($fld =~ s/-$//) {
+			$self->{dont_validate}->{$fld}++;
 		}
 
 		$log->logdie("need field name in line $curr_line: $l") unless (defined($fld));
@@ -113,20 +117,20 @@
 	$self ? return $self : return undef;
 }
 
-=head2 validate_errors
+=head2 validate_rec
 
 Validate record and return errors
 
-  my @errors = $validate->validate_errors( $rec, $rec_dump );
+  my @errors = $validate->validate_rec( $rec, $rec_dump );
 
 =cut
 
-sub validate_errors {
+sub validate_rec {
 	my $self = shift;
 
 	my $log = $self->_get_logger();
 
-	my $rec = shift || $log->logdie("validate_errors need record");
+	my $rec = shift || $log->logdie("validate_rec need record");
 	my $rec_dump = shift;
 
 	$log->logdie("rec isn't HASH") unless (ref($rec) eq 'HASH');
@@ -142,16 +146,19 @@
 
 		next if (!defined($f) || $f eq '' || $f eq '000');
 
+		next if (defined( $self->{dont_validate}->{$f} ));
+
+		# track field usage
 		$fields->{$f}++;
 
 		if ( ! defined($r->{$f}) ) {
-			$errors->{field}->{ $f }->{unexpected} = "this field is not expected";
+			$errors->{ $f }->{unexpected} = "this field is not expected";
 			next;
 		}
 
 
 		if (ref($rec->{$f}) ne 'ARRAY') {
-			$errors->{field}->{ $f }->{not_repeatable} = "probably bug in parsing input data";
+			$errors->{ $f }->{not_repeatable} = "probably bug in parsing input data";
 			next;
 		}
 
@@ -160,10 +167,10 @@
 			if (ref($r->{$f}) eq 'ARRAY') {
 				# are values hashes? (has subfields)
 				if (! defined($v)) {
-#					$errors->{field}->{$f}->{empty} = undef;
+#					$errors->{$f}->{empty} = undef;
 #					$errors->{dump} = $rec_dump if ($rec_dump);
 				} elsif (ref($v) ne 'HASH') {
-					$errors->{field}->{$f}->{missing_subfield} = join(",", @{ $r->{$f} }) . " required";
+					$errors->{$f}->{missing_subfield} = join(",", @{ $r->{$f} }) . " required";
 					next;
 				} else {
 
@@ -185,7 +192,7 @@
 								$sf_repeatable->{$sf}++;
 							};
 							if (! first { $_ eq $sf } @{ $r->{$f} }) {
-								$errors->{field}->{ $f }->{subfield}->{extra}->{$sf}++;
+								$errors->{ $f }->{subfield}->{extra}->{$sf}++;
 							}
 						}
 
@@ -193,9 +200,8 @@
 					if (my @r_sf = sort keys( %$sf_repeatable )) {
 
 						foreach my $sf (@r_sf) {
-							$errors->{field}->{$f}->{subfield}->{extra_repeatable}->{$sf}++;
-							$errors->{field}->{$f}->{dump} =
-								join('', _pack_subfields_hash( $h, 1 ) );
+							$errors->{$f}->{subfield}->{extra_repeatable}->{$sf}++;
+							$errors->{$f}->{dump} = _pack_subfields_hash( $h, 1 );
 						}
 
 					}
@@ -203,28 +209,27 @@
 					if ( defined( $self->{must_exist_sf}->{$f} ) ) {
 						foreach my $sf (sort keys %{ $self->{must_exist_sf}->{$f} }) {
 #warn "====> $f $sf must exist\n";
-							$errors->{field}->{$f}->{subfield}->{missing}->{$sf}++
+							$errors->{$f}->{subfield}->{missing}->{$sf}++
 								unless defined( $subfields->{$sf} );
 						}
 					}
 
 				}
 			} elsif (ref($v) eq 'HASH') {
-				$errors->{field}->{$f}->{unexpected_subfields}++;
-				$errors->{field}->{$f}->{dump} =
-					join('', _pack_subfields_hash( $v, 1 ) );
+				$errors->{$f}->{unexpected_subfields}++;
+				$errors->{$f}->{dump} = _pack_subfields_hash( $v, 1 );
 			}
 		}
 	}
 
 	foreach my $must (sort keys %{ $self->{must_exist} }) {
 		next if ($fields->{$must});
-		$errors->{field}->{$must}->{missing}++;
+		$errors->{$must}->{missing}++;
 		$errors->{dump} = $rec_dump if ($rec_dump);
 	}
 
 	if ($errors) {
-		$log->debug("errors: ", sub { dump( $errors ) } );
+		$log->debug("errors: ", $self->report_error( $errors ) );
 
 		my $mfn = $rec->{'000'}->[0] || $log->logconfess("record ", dump( $rec ), " doesn't have MFN");
 		$self->{errors}->{$mfn} = $errors;
@@ -261,21 +266,23 @@
 	return $self->{errors};
 }
 
-=head2 report
+=head2 report_error
 
-Produce nice humanly readable report of errors
+Produce nice humanly readable report of single error
 
-  print $validate->report;
+  print $validate->report_error( $error_hash );
 
 =cut
 
-sub report {
+sub report_error {
 	my $self = shift;
 
-	my $log = $self->_get_logger();
+	my $h = shift || die "no hash?";
 
-	sub unroll {
-		my ($tree, $accumulated) = @_;
+	sub _unroll {
+		my ($self, $tree, $accumulated) = @_;
+
+		my $log = $self->_get_logger();
 
 		$log->debug("# ",
 			( $tree			? "tree: $tree "					: '' ),
@@ -294,13 +301,13 @@
 
 			if ($k eq 'dump') {
 				$dump = $tree->{dump};
-				warn "## dump: $dump\n";
+#				warn "## dump: ",dump($dump),"\n";
 				next;
 			}
 
 			$log->debug("current: $k");
 
-			my ($new_results, $new_dump) = unroll($tree->{$k},
+			my ($new_results, $new_dump) = $self->_unroll($tree->{$k},
 				$accumulated ? "$accumulated\t$k" : $k
 			);
 
@@ -324,15 +331,53 @@
 		}
 	}
 
+
+	sub _reformat {
+		my $l = shift;
+		$l =~ s/\t/ /g;
+		$l =~ s/_/ /;
+		return $l;
+	}
+
 	my $out = '';
+
+	for my $f (sort keys %{ $h }) {
+		$out .= "$f: ";
+		
+		my ($r, $d) = $self->_unroll( $h->{$f} );
+		my $e;
+		if (ref($r) eq 'ARRAY') {
+			$e .= join(", ", map { _reformat( $_ ) } @$r);
+		} else {
+			$e .= _reformat( $r );
+		}
+		$e .= "\n\t$d" if ($d);
+
+		$out .= $e . "\n";
+	}
+	return $out;
+}
+
+
+=head2 report
+
+Produce nice humanly readable report of errors
+
+  print $validate->report;
+
+=cut
+
+sub report {
+	my $self = shift;
 	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";
+	my $out;
+	foreach my $mfn (sort { $a <=> $b } keys %$e) {
+		$out .= "MFN $mfn\n" . $self->report_error( $e->{$mfn} ) . "\n";
 	}
 
 	return $out;
+
 }
 
 =head1 AUTHOR