support databases without normalization (useful for input files which are

used just for lookups)

git-svn-id: svn+ssh://mjesec/home/dpavlin/svn/webpac2/trunk@1084 07558da8-63fa-0310-ba24-9fe276d99e06

diff --git a/run.pl b/run.pl
index 0b15104..c3d3b77 100755 (executable)
--- a/run.pl
+++ b/run.pl
@@ -328,6 +328,7 @@ 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 );
@@ -489,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
@@ -559,46 +562,49 @@ foreach my $database ( sort keys %{ $config->databases } ) {
                                next;   # validation doesn't create any output
                        }
 
-                       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) = @_;
+                       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(
+                                               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,
-                                       );
-                               },
-                       );
+                                               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;
 
-                       if ( $ds ) {
+                                       foreach my $out ( @output_modules ) {
+                                               $out->add( $mfn, $ds ) if $out->can('add');
+                                       }
 
-                               $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;
                                }
-
-                       } else {
-                               $log->warn("record $pos didn't produce any output after normalization rules!") unless $marc;
                        }
 
                        if ($marc) {