really download citations

[webpac2] / run.pl

diff --git a/run.pl b/run.pl
index 5f7b247..5560537 100755 (executable)
--- a/run.pl
+++ b/run.pl
@@ -383,7 +383,7 @@ foreach my $database ( sort keys %{ $config->databases } ) {
                        next;
                }
 
-               next if ($only_input && ($input_name !~ m#$only_input#i && $input->{type} !~ m#$only_input#i));
+               next if defined $only_input && $input_name !~ m#$only_input#i;
 
                my $type = lc($input->{type});
 
@@ -542,7 +542,10 @@ foreach my $database ( sort keys %{ $config->databases } ) {
                }
 
                my $rules = $parser->normalize_rules($database,$input_name);
-               $log->logwarn("no normalize rules for $database/$input_name") unless $rules;
+               if ( ! $rules ) {
+                       $log->logwarn("no normalize rules for $database/$input_name", $input_db->input_module->can('normalize') ? " using normalize from input module" : '');
+                       next;
+               }
 
                $log->debug("parsed normalize rules:\n$rules");
 
@@ -616,9 +619,11 @@ foreach my $database ( sort keys %{ $config->databases } ) {
                                next;   # validation doesn't create any output
                        }
 
+                       my $ds;
+
                        if ($rules) {
 
-                               my $ds = WebPAC::Normalize::data_structure(
+                               $ds = WebPAC::Normalize::data_structure(
                                        row => $row,
                                        rules => $rules,
                                        lookup => $lookup_hash,
@@ -635,32 +640,33 @@ foreach my $database ( sort keys %{ $config->databases } ) {
                                        },
                                );
 
-                               $log->debug("ds = ", sub { dump($ds) });
-
-                               if ( $ds ) {
-
-                                       $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;
+                       } elsif ( $input_db->input_module->can('normalize') ) {
+                               $ds = $input_db->input_module->normalize( $mfn );
+                       }
 
-                                       foreach my $out ( @output_modules ) {
-                                               $out->add( $mfn, $ds ) if $out->can('add');
-                                       }
+                       if ( $ds ) {
+                               $log->debug("ds = ", sub { dump($ds) });
 
-                               } else {
-                                       $log->warn("record $pos didn't produce any output after normalization rules!") unless $marc;
+                               $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;
+
+                               foreach my $out ( @output_modules ) {
+                                       $out->add( $mfn, $ds ) if $out->can('add');
                                }
-                       }
 
+                       } else {
+                               $log->warn("record $pos didn't produce any output after normalization rules!") unless $marc;
+                       }
                        if ($marc) {
                                my $i = 0;