--- trunk/run.pl	2007/05/24 12:44:45	837
+++ trunk/run.pl	2007/05/27 22:24:30	864
@@ -68,6 +68,9 @@
 
 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
@@ -144,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 );
@@ -172,9 +177,7 @@
 
 my $validate;
 $validate = new WebPAC::Validate(
-	path => $validate_path,
 	delimiters => $config->webpac('delimiters'),
-	delimiters_path => $validate_delimiters_path,
 ) if ($validate_path || $validate_delimiters_path);
 
 my $use_indexer = $config->use_indexer;
@@ -209,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);
@@ -442,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 ) ) if ( $validate_path );
+				$validate->read_validate_delimiters_file( $validate->fill_in( $validate_delimiters_path, database => $database, input => $input_name ) ) if ( $validate_delimiters_path );
+			}
 		}
 
 		my $marc;
@@ -568,7 +577,10 @@
 				print $report_fh "$errors\n" if ($report_fh);
 			}
 
-			print $report_fh "\nAll possible subfields/delimiter templates:\n", $validate->delimiters_templates( report => 1 ), "\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) {
@@ -581,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'));
@@ -610,7 +621,7 @@
 }
 
 # save new delimiters if needed
-$validate->save_delimiters_templates;
+$validate->save_delimiters_templates if ( $validate_delimiters_path );
 
 #
 # handle links or merge after indexing