r1285@llin: dpavlin | 2007-06-21 14:53:43 +0200

[webpac2] / run.pl

diff --git a/run.pl b/run.pl
index 9e69a83..036b1bb 100755 (executable)
--- a/run.pl
+++ b/run.pl
@@ -185,7 +185,7 @@ $stats ||= $validate;
 if ($stats) {
        $log->debug("disabled indexing for stats collection");
        $use_indexer = undef;
-} else {
+} elsif ( $use_indexer ) {
        $log->info("using $use_indexer indexing engine...");
 }
 
@@ -244,19 +244,19 @@ foreach my $database ( sort keys %{ $config->databases } ) {
                if ($use_indexer eq 'hyperestraier') {
 
                        # open Hyper Estraier database
-                       use WebPAC::Output::Estraier '0.10';
+                       require WebPAC::Output::Estraier;
                        $indexer = new WebPAC::Output::Estraier( %{ $indexer_config } );
                
                } elsif ($use_indexer eq 'hyperestraier-native') {
 
                        # open Hyper Estraier database
-                       use WebPAC::Output::EstraierNative;
+                       require WebPAC::Output::EstraierNative;
                        $indexer = new WebPAC::Output::EstraierNative( %{ $indexer_config } );
 
                } elsif ($use_indexer eq 'kinosearch') {
 
                        # open KinoSearch
-                       use WebPAC::Output::KinoSearch;
+                       require WebPAC::Output::KinoSearch;
                        $indexer_config->{clean} = 1 unless (-e $indexer_config->{index_path});
                        $indexer = new WebPAC::Output::KinoSearch( %{ $indexer_config } );
 
@@ -264,7 +264,7 @@ foreach my $database ( sort keys %{ $config->databases } ) {
                        $log->logdie("unknown use_indexer: $use_indexer");
                }
 
-               $log->logide("can't continue without valid indexer") unless ($indexer);
+               $log->logdie("can't continue without valid indexer") unless ($indexer);
        }
 
 
@@ -448,8 +448,8 @@ foreach my $database ( sort keys %{ $config->databases } ) {
                        $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 ) );
+                               $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 );
                        }
                }
 
@@ -621,7 +621,7 @@ if ($parallel) {
 }
 
 # save new delimiters if needed
-$validate->save_delimiters_templates if ( $validate );
+$validate->save_delimiters_templates if ( $validate_delimiters_path );
 
 #
 # handle links or merge after indexing