r1650@llin: dpavlin | 2007-11-20 11:07:57 +0100

[webpac2] / lib / WebPAC / Validate.pm

diff --git a/lib/WebPAC/Validate.pm b/lib/WebPAC/Validate.pm
index 3c0f65b..d7ed6fb 100644 (file)
--- a/lib/WebPAC/Validate.pm
+++ b/lib/WebPAC/Validate.pm
@@ -135,7 +135,7 @@ sub read_validate_file {
                if (@d) {
                        $v->{$fld} = [ map {
                                my $sf = $_;
-                               if ( $sf =~ s/!(\*)?$/$1/ ) {
+                               if ( $sf =~ s/!// ) {
                                        $self->{must_exist_sf}->{ $fld }->{ $sf }++;
                                };
                                $sf;
@@ -273,6 +273,7 @@ sub validate_rec {
 #                                      $errors->{dump} = $rec_dump if ($rec_dump);
                                } elsif (ref($v) ne 'HASH') {
                                        $errors->{$f}->{missing_subfield} = join(",", @{ $r->{$f} }) . " required";
+                                       $errors->{$f}->{dump} = $v;
                                        next;
                                } else {
 
@@ -293,7 +294,7 @@ sub validate_rec {
                                                        if ( ref($v->{$sf}) eq 'ARRAY' ) {
                                                                $sf_repeatable->{$sf}++;
                                                        };
-                                                       if (! first { $_ eq $sf } @{ $r->{$f} }) {
+                                                       if (! defined first { $_ eq $sf } @{ $r->{$f} }) {
                                                                $errors->{ $f }->{subfield}->{extra}->{$sf}++;
                                                        }
                                                }
@@ -592,6 +593,8 @@ sub save_delimiters_templates {
        close($d);
 
        $log->info("new delimiters templates saved to $path");
+
+       return 1;
 }
 
 =head1 AUTHOR