--- trunk/run.pl 2007/11/28 11:14:44 1075 +++ trunk/run.pl 2007/12/23 22:06:08 1084 @@ -328,6 +328,7 @@ # 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 @@ ); } - 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 @@ 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 ) { - - $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'); + } - 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) {