added fill_in to create dynamic values and some tests

[webpac2] / run.pl

diff --git a/run.pl b/run.pl
index f653aff..ee187ad 100755 (executable)
--- a/run.pl
+++ b/run.pl
@@ -68,6 +68,14 @@ and subfield usage for each input
 
 turn on extra validation of imput records, see L<WebPAC::Validation>
 
+You can use special variables C<$database> and $C<$input> in this parametar
+like C<--validate 'conf/validate/$database-$input'> to construct filename
+
+=item --validate-delimiters path/to/validate_delimiters_file
+
+this option is used with C<--validate> to turn on extra validation of
+delimiters. If file is non existant, it will be created on first run.
+
 =item --marc-generate
 
 Generate MARC file. This will automatically be on if file contains C<marc*> directives.
@@ -108,6 +116,7 @@ my $debug = 0;
 my $only_filter;
 my $stats = 0;
 my $validate_path;
+my $validate_delimiters_path;
 my $marc_generate = 1;
 my $marc_lint = 1;
 my $marc_dump = 0;
@@ -128,6 +137,7 @@ GetOptions(
        "debug+" => \$debug,
        "stats" => \$stats,
        "validate=s" => \$validate_path,
+       "validate-delimiters=s" => \$validate_delimiters_path,
        "marc-generate!" => \$marc_generate,
        "marc-lint!" => \$marc_lint,
        "marc-dump!" => \$marc_dump,
@@ -137,6 +147,8 @@ GetOptions(
        "help" => \$help,
 );
 
+$marc_generate = 0 if ( $validate_delimiters_path );
+
 pod2usage(-verbose => 2) if ($help);
 
 my $config = new WebPAC::Config( path => $config_path );
@@ -163,13 +175,12 @@ if ($merge) {
        $log->info("created merge batch file $estcmd_path");
 }
 
-
 my $validate;
 $validate = new WebPAC::Validate(
        path => $validate_path,
        delimiters => $config->webpac('delimiters'),
-) if ($validate_path);
-
+       delimiters_path => $validate_delimiters_path,
+) if ($validate_path || $validate_delimiters_path);
 
 my $use_indexer = $config->use_indexer;
 $stats ||= $validate;
@@ -562,7 +573,10 @@ while (my ($database, $db_config) = each %{ $config->databases }) {
                                print $report_fh "$errors\n" if ($report_fh);
                        }
 
-                       print $report_fh "\nAll possible subfields/delimiter templates:\n", $validate->delimiters_templates, "\n\n";
+                       print $report_fh "\nAll possible subfields/delimiter templates:\n", $validate->delimiters_templates( report => 1, current_input => 1 ), "\n\n";
+
+                       # must be last thing that touches $validate for this input
+                       $validate->reset;
                }
 
                if ($stats) {
@@ -575,8 +589,7 @@ while (my ($database, $db_config) = each %{ $config->databases }) {
                $marc->finish if ($marc);
 
                # close report
-               close($report_fh) if ($report_fh)
-
+               close($report_fh) if ($report_fh);
        }
 
        eval { $indexer->finish } if ($indexer && $indexer->can('finish'));
@@ -603,6 +616,9 @@ if ($parallel) {
        $log->info("all parallel processes finished");
 }
 
+# save new delimiters if needed
+$validate->save_delimiters_templates if ( $validate );
+
 #
 # handle links or merge after indexing
 #