r494@llin: dpavlin | 2006-02-27 00:22:59 +0100

[webpac2] / run.pl

diff --git a/run.pl b/run.pl
index f32337d..7a833f5 100755 (executable)
--- a/run.pl
+++ b/run.pl
@@ -13,7 +13,7 @@ use WebPAC::Input 0.03;
 use WebPAC::Store 0.03;
 use WebPAC::Normalize::XML;
 use WebPAC::Output::TT;
-use WebPAC::Output::Estraier 0.08;
+use WebPAC::Output::Estraier '0.10';
 use YAML qw/LoadFile/;
 use Getopt::Long;
 use File::Path;
@@ -92,6 +92,7 @@ while (my ($database, $db_config) = each %{ $config->{databases} }) {
        my $est_config = $config->{hyperestraier} || $log->logdie("can't find 'hyperestraier' part in confguration");
        $est_config->{database} = $database;
        $est_config->{clean} = $clean;
+       $est_config->{label} = $db_config->{name};
 
        my $est = new WebPAC::Output::Estraier( %{ $est_config } );
 
@@ -107,7 +108,7 @@ while (my ($database, $db_config) = each %{ $config->{databases} }) {
                $log->info("creating new database $database in $db_path");
                rmtree( $db_path ) || $log->warn("can't remove $db_path: $!");
        } else {
-               $log->info("working on $database in $db_path");
+               $log->debug("working on $database in $db_path");
        }
 
        my $db = new WebPAC::Store(
@@ -144,7 +145,7 @@ while (my ($database, $db_config) = each %{ $config->{databases} }) {
 
                my $input_module = $config->{webpac}->{inputs}->{$type};
 
-               $log->info("working on input $input->{path} [$input->{type}] using $input_module");
+               $log->info("working on input '$input->{path}' [$input->{type}] using $input_module lookup '$input->{lookup}'");
 
                my $input_db = new WebPAC::Input(
                        module => $input_module,
@@ -152,6 +153,7 @@ while (my ($database, $db_config) = each %{ $config->{databases} }) {
                        limit => $limit || $input->{limit},
                        offset => $offset,
                        lookup => $lookup,
+                       recode => $input->{recode},
                );
                $log->logdie("can't create input using $input_module") unless ($input);