--- trunk/run.pl	2007/04/01 21:47:48	814
+++ trunk/run.pl	2007/05/27 16:49:15	857
@@ -12,7 +12,7 @@
 use WebPAC::Store 0.14;
 use WebPAC::Normalize 0.22;
 use WebPAC::Output::TT;
-use WebPAC::Validate 0.06;
+use WebPAC::Validate 0.11;
 use WebPAC::Output::MARC;
 use WebPAC::Config;
 use Getopt::Long;
@@ -68,6 +68,14 @@
 
 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 $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 @@
 	"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 @@
 	"help" => \$help,
 );
 
+$marc_generate = 0 if ( $validate_delimiters_path );
+
 pod2usage(-verbose => 2) if ($help);
 
 my $config = new WebPAC::Config( path => $config_path );
@@ -163,12 +175,10 @@
 	$log->info("created merge batch file $estcmd_path");
 }
 
-
 my $validate;
 $validate = new WebPAC::Validate(
-	path => $validate_path,
-) if ($validate_path);
-
+	delimiters => $config->webpac('delimiters'),
+) if ($validate_path || $validate_delimiters_path);
 
 my $use_indexer = $config->use_indexer;
 $stats ||= $validate;
@@ -202,7 +212,8 @@
 	return $c;
 }
 
-while (my ($database, $db_config) = each %{ $config->databases }) {
+foreach my $database ( sort keys %{ $config->databases } ) {
+	my $db_config = $config->databases->{$database};
 
 	my ($only_database,$only_input) = split(m#/#, $only_filter) if ($only_filter);
 	next if ($only_database && $database !~ m/$only_database/i);
@@ -435,6 +446,11 @@
 			print $report_fh "Report for database '$database' input '$input_name' records ",
 				$offset || 1, "-", $limit || $input->{limit} || $maxmfn, "\n\n";
 			$log->info("Generating report file $path");
+
+			if ( $validate ) {
+				$validate->read_validate_file( $validate->fill_in( $validate_path, database => $database, input => $input_name ) );
+				$validate->read_validate_delimiters_file( $validate->fill_in( $validate_delimiters_path, database => $database, input => $input_name ) );
+			}
 		}
 
 		my $marc;
@@ -560,6 +576,11 @@
 				$log->info("validation errors:\n$errors\n" );
 				print $report_fh "$errors\n" if ($report_fh);
 			}
+
+			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) {
@@ -572,8 +593,7 @@
 		$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'));
@@ -600,6 +620,9 @@
 	$log->info("all parallel processes finished");
 }
 
+# save new delimiters if needed
+$validate->save_delimiters_templates if ( $validate );
+
 #
 # handle links or merge after indexing
 #