WebPAC::Input::Excel dependencies
[webpac2] / run.pl
diff --git a/run.pl b/run.pl
index bc00a84..c3d3b77 100755 (executable)
--- a/run.pl
+++ b/run.pl
@@ -133,7 +133,7 @@ GetOptions(
        "clean" => \$clean,
        "one=s" => \$only_filter,
        "only=s" => \$only_filter,
-       "config" => \$config_path,
+       "config=s" => \$config_path,
        "debug+" => \$debug,
        "stats" => \$stats,
        "validate=s" => \$validate_path,
@@ -153,6 +153,8 @@ pod2usage(-verbose => 2) if ($help);
 
 my $config = new WebPAC::Config( path => $config_path );
 
+WebPAC::Normalize::_debug( $debug - 1 ) if $debug > 1;
+
 #print "config = ",dump($config) if ($debug);
 
 die "no databases in config file!\n" unless ($config->databases);
@@ -191,7 +193,13 @@ if ($stats) {
 
 # parse normalize files and create source files for lookup and normalization
 
-my $parser = new WebPAC::Parser( config => $config );
+my ($only_database,$only_input) = split(m#/#, $only_filter) if $only_filter;
+
+my $parser = new WebPAC::Parser(
+       config => $config,
+       only_database => $only_database,
+       only_input => $only_input,
+);
 
 my $total_rows = 0;
 my $start_t = time();
@@ -215,7 +223,6 @@ sub create_ds_config {
 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);
 
        if ($parallel) {
@@ -321,12 +328,15 @@ foreach my $database ( sort keys %{ $config->databases } ) {
 
                # add database to arugemnts for output filter
                $output->{database} = $database;
+               $output->{clean} = $clean;
 
                $log->debug("calling $module->new(",dump( $output ),")");
                my $out = new $module->new( $output );
-               $out->init;
-
-               push @output_modules, $out;
+               if ( $out->init ) {
+                       push @output_modules, $out;
+               } else {
+                       $log->warn("SKIPPED $module");
+               }
        }
 
 
@@ -347,13 +357,20 @@ foreach my $database ( sort keys %{ $config->databases } ) {
 
                my $type = lc($input->{type});
 
-               die "I know only how to handle input types ", join(",", $config->webpac('inputs') ), " not '$type'!\n" unless (grep(/$type/, $config->webpac('inputs')));
+               # FIXME check if input module exists
+               my $input_module = $input->{module};
 
-               my $input_module = $config->webpac('inputs')->{$type};
+               if ( ! $input_module ) {
+                       if ( grep(/$type/, $config->webpac('inputs')) ) {
+                               $input_module = $config->webpac('inputs')->{$type};
+                       } else {
+                               $log->logdie("I know only how to handle input types ", join(",", $config->webpac('inputs') ), " not '$type'!" );
+                       }
+               }
 
                my @lookups = $parser->have_lookup_create($database, $input);
 
-               $log->info("working on input '$input_name' in $input->{path} [type: $input->{type}] using $input_module",
+               $log->info("working on $database/$input_name with $input_module on $input->{path}",
                        @lookups ? " creating lookups: ".join(", ", @lookups) : ""
                );
 
@@ -473,7 +490,9 @@ foreach my $database ( sort keys %{ $config->databases } ) {
                        );
                }
 
-               my $rules = $parser->normalize_rules($database,$input_name) || $log->logdie("no normalize rules found for $database/$input_name");
+               my $rules = $parser->normalize_rules($database,$input_name);
+               $log->logwarn("no normalize rules for $database/$input_name") unless $rules;
+
                $log->debug("parsed normalize rules:\n$rules");
 
                # reset position in database
@@ -543,59 +562,65 @@ foreach my $database ( sort keys %{ $config->databases } ) {
                                next;   # validation doesn't create any output
                        }
 
-                       if ( my $ds = WebPAC::Normalize::data_structure(
-                               row => $row,
-                               rules => $rules,
-                               lookup => $lookup_hash,
-                               config => create_ds_config( $db_config, $database, $input, $mfn ),
-                               marc_encoding => 'utf-8',
-                               load_row_coderef => sub {
-                                       my ($database,$input,$mfn) = @_;
-                                       return $store->load_row(
+                       if ($rules) {
+
+                               my $ds = WebPAC::Normalize::data_structure(
+                                       row => $row,
+                                       rules => $rules,
+                                       lookup => $lookup_hash,
+                                       config => create_ds_config( $db_config, $database, $input, $mfn ),
+                                       marc_encoding => 'utf-8',
+                                       load_row_coderef => sub {
+                                               my ($database,$input,$mfn) = @_;
+#warn "### load_row($database,$input,$mfn) from data_structure\n";
+                                               return $store->load_row(
+                                                       database => $database,
+                                                       input => $input,
+                                                       id => $mfn,
+                                               );
+                                       },
+                               );
+
+                               $log->debug("ds = ", sub { dump($ds) });
+
+                               if ( $ds ) {
+
+                                       $store->save_ds(
                                                database => $database,
-                                               input => $input,
+                                               input => $input_name,
                                                id => $mfn,
-                                       );
-                               },
-                       ) ) { # if
+                                               ds => $ds,
+                                       ) if !$stats;
 
-                               $log->debug("ds = ", sub { dump($ds) });
+                                       $indexer->add(
+                                               id => "${input_name}/${mfn}",
+                                               ds => $ds,
+                                               type => $config->get($indexer_config)->{type},
+                                       ) if $indexer;
 
-                               $store->save_ds(
-                                       database => $database,
-                                       input => $input_name,
-                                       id => $mfn,
-                                       ds => $ds,
-                               ) if !$stats;
-
-                               $indexer->add(
-                                       id => "${input_name}/${mfn}",
-                                       ds => $ds,
-                                       type => $config->get($indexer_config)->{type},
-                               ) if $indexer;
-
-                               if ($marc) {
-                                       my $i = 0;
-
-                                       while (my $fields = WebPAC::Normalize::_get_marc_fields( fetch_next => 1 ) ) {
-                                               $marc->add(
-                                                       id => $mfn . ( $i ? "/$i" : '' ),
-                                                       fields => $fields,
-                                                       leader => WebPAC::Normalize::_get_marc_leader(),
-                                                       row => $row,
-                                               );
-                                               $i++;
+                                       foreach my $out ( @output_modules ) {
+                                               $out->add( $mfn, $ds ) if $out->can('add');
                                        }
 
-                                       $log->info("Created $i instances of MFN $mfn\n") if ($i > 1);
+                               } else {
+                                       $log->warn("record $pos didn't produce any output after normalization rules!") unless $marc;
                                }
+                       }
 
-                               foreach my $out ( @output_modules ) {
-                                       $out->add( $mfn, $ds ) if $out->can('add');
+                       if ($marc) {
+                               my $i = 0;
+
+                               while (my $fields = WebPAC::Normalize::MARC::_get_marc_fields( fetch_next => 1 ) ) {
+                                       $marc->add(
+                                               id => $mfn . ( $i ? "/$i" : '' ),
+                                               fields => $fields,
+                                               leader => WebPAC::Normalize::MARC::_get_marc_leader(),
+                                               row => $row,
+                                       );
+                                       $i++;
                                }
 
-                       } else {
-                               $log->warn("record $pos didn't produce any output after normalization rules!");
+                               $log->info("Created $i instances of MFN $mfn\n") if ($i > 1);
                        }
 
                }