create MARC files even when normalization rules don't return any data_structure
git-svn-id: svn+ssh://mjesec/home/dpavlin/svn/webpac2/trunk@977
07558da8-63fa-0310-ba24-
9fe276d99e06
# parse normalize files and create source files for lookup and normalization
# 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();
my $total_rows = 0;
my $start_t = time();
foreach my $database ( sort keys %{ $config->databases } ) {
my $db_config = $config->databases->{$database};
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) {
next if ($only_database && $database !~ m/$only_database/i);
if ($parallel) {
next; # validation doesn't create any output
}
next; # validation doesn't create any output
}
- if ( my $ds = WebPAC::Normalize::data_structure(
+ my $ds = WebPAC::Normalize::data_structure(
row => $row,
rules => $rules,
lookup => $lookup_hash,
row => $row,
rules => $rules,
lookup => $lookup_hash,
marc_encoding => 'utf-8',
load_row_coderef => sub {
my ($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,
);
},
return $store->load_row(
database => $database,
input => $input,
id => $mfn,
);
},
+ );
+
+ $log->debug("ds = ", sub { dump($ds) });
- $log->debug("ds = ", sub { dump($ds) });
$store->save_ds(
database => $database,
$store->save_ds(
database => $database,
type => $config->get($indexer_config)->{type},
) if $indexer;
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++;
- }
-
- $log->info("Created $i instances of MFN $mfn\n") if ($i > 1);
- }
-
foreach my $out ( @output_modules ) {
$out->add( $mfn, $ds ) if $out->can('add');
}
} else {
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!");
+ $log->warn("record $pos didn't produce any output after normalization rules!") unless $marc;
+ }
+
+ 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++;
+ }
+
+ $log->info("Created $i instances of MFN $mfn\n") if ($i > 1);