--- trunk/run.pl	2007/05/24 12:44:45	837
+++ trunk/run.pl	2007/05/27 11:14:40	851
@@ -144,6 +144,8 @@
 	"help" => \$help,
 );
 
+$marc_generate = 0 if ( $validate_delimiters_path );
+
 pod2usage(-verbose => 2) if ($help);
 
 my $config = new WebPAC::Config( path => $config_path );
@@ -568,7 +570,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 +586,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 +614,7 @@
 }
 
 # save new delimiters if needed
-$validate->save_delimiters_templates;
+$validate->save_delimiters_templates if ( $validate );
 
 #
 # handle links or merge after indexing