--- trunk/run.pl	2007/05/27 16:00:26	856
+++ trunk/run.pl	2007/05/27 16:49:15	857
@@ -177,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;
@@ -214,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);
@@ -447,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;