--- trunk/run.pl	2006/10/05 12:57:51	736
+++ trunk/run.pl	2006/10/08 20:28:17	755
@@ -7,7 +7,7 @@
 use lib './lib';
 
 use WebPAC::Common 0.02;
-use WebPAC::Parser 0.04;
+use WebPAC::Parser 0.08;
 use WebPAC::Input 0.13;
 use WebPAC::Store 0.11;
 use WebPAC::Normalize 0.22;
@@ -67,17 +67,9 @@
 
 turn on extra validation of imput records, see L<WebPAC::Validation>
 
-=item --marc-normalize conf/normalize/mapping.pl
-
-This option specifies normalisation file for MARC creation
-
-=item --marc-output out/marc/test.marc
-
-Optional path to output file
-
 =item --marc-lint
 
-By default turned on if C<--marc-normalize> is used. You can disable lint
+By default turned on if normalisation file has C<marc*> directives. You can disable lint
 messages with C<--no-marc-lint>.
 
 =item --marc-dump
@@ -110,7 +102,6 @@
 my $only_filter;
 my $stats = 0;
 my $validate_path;
-my ($marc_normalize, $marc_output);
 my $marc_lint = 1;
 my $marc_dump = 0;
 my $parallel = 0;
@@ -129,8 +120,6 @@
 	"debug+" => \$debug,
 	"stats" => \$stats,
 	"validate=s" => \$validate_path,
-	"marc-normalize=s" => \$marc_normalize,
-	"marc-output=s" => \$marc_output,
 	"marc-lint!" => \$marc_lint,
 	"marc-dump!" => \$marc_dump,
 	"parallel=i" => \$parallel,
@@ -171,9 +160,6 @@
 	$log->info("using $use_indexer indexing engine...");
 }
 
-# disable indexing when creating marc
-$use_indexer = undef if ($marc_normalize);
-
 # parse normalize files and create source files for lookup and normalization
 
 my $parser = new WebPAC::Parser( config => $config );
@@ -212,7 +198,7 @@
 	}
 
 	my $indexer;
-	if ($use_indexer) {
+	if ($use_indexer && $parser->have_rules( 'search', $database )) {
 
 		my $cfg_name = $use_indexer;
 		$cfg_name =~ s/\-.*$//;
@@ -422,9 +408,9 @@
 		}
 
 		my $marc;
-		if ($marc_normalize) {
+		if ($parser->have_rules( 'marc', $database, $input_name )) {
 			$marc = new WebPAC::Output::MARC(
-				path => $marc_output || "out/marc/${database}-${input_name}.marc",
+				path => "out/marc/${database}-${input_name}.marc",
 				lint => $marc_lint,
 				dump => $marc_dump,
 			);
@@ -501,7 +487,7 @@
 				},
 			);
 
-			$log->debug("ds = ",dump($ds));
+			$log->debug("ds = ",dump($ds)) if ($ds);
 
 			$store->save_ds(
 				database => $database,