--- trunk/run.pl 2006/12/13 10:08:27 790 +++ trunk/run.pl 2007/10/30 23:32:58 921 @@ -9,10 +9,10 @@ use WebPAC::Common 0.02; use WebPAC::Parser 0.08; use WebPAC::Input 0.16; -use WebPAC::Store 0.14; +use WebPAC::Store 0.15; use WebPAC::Normalize 0.22; use WebPAC::Output::TT; -use WebPAC::Validate 0.06; +use WebPAC::Validate 0.11; use WebPAC::Output::MARC; use WebPAC::Config; use Getopt::Long; @@ -68,6 +68,19 @@ turn on extra validation of imput records, see L +You can use special variables C<$database> and $C<$input> in this parametar +like C<--validate 'conf/validate/$database-$input'> to construct filename + +=item --validate-delimiters path/to/validate_delimiters_file + +this option is used with C<--validate> to turn on extra validation of +delimiters. If file is non existant, it will be created on first run. + +=item --marc-generate + +Generate MARC file. This will automatically be on if file contains C directives. +You can use this option as C<--no-marc-generate> to disable MARC generation. + =item --marc-lint By default turned on if normalisation file has C directives. You can disable lint @@ -103,6 +116,8 @@ my $only_filter; my $stats = 0; my $validate_path; +my $validate_delimiters_path; +my $marc_generate = 1; my $marc_lint = 1; my $marc_dump = 0; my $parallel = 0; @@ -122,6 +137,8 @@ "debug+" => \$debug, "stats" => \$stats, "validate=s" => \$validate_path, + "validate-delimiters=s" => \$validate_delimiters_path, + "marc-generate!" => \$marc_generate, "marc-lint!" => \$marc_lint, "marc-dump!" => \$marc_dump, "parallel=i" => \$parallel, @@ -130,6 +147,8 @@ "help" => \$help, ); +$marc_generate = 0 if ( $validate_delimiters_path ); + pod2usage(-verbose => 2) if ($help); my $config = new WebPAC::Config( path => $config_path ); @@ -156,19 +175,17 @@ $log->info("created merge batch file $estcmd_path"); } - my $validate; $validate = new WebPAC::Validate( - path => $validate_path, -) if ($validate_path); - + delimiters => $config->webpac('delimiters'), +) if ($validate_path || $validate_delimiters_path); my $use_indexer = $config->use_indexer; $stats ||= $validate; if ($stats) { $log->debug("disabled indexing for stats collection"); $use_indexer = undef; -} else { +} elsif ( $use_indexer ) { $log->info("using $use_indexer indexing engine..."); } @@ -195,7 +212,8 @@ return $c; } -while (my ($database, $db_config) = each %{ $config->databases }) { +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); @@ -226,27 +244,24 @@ if ($use_indexer eq 'hyperestraier') { # open Hyper Estraier database - use WebPAC::Output::Estraier '0.10'; + require WebPAC::Output::Estraier; $indexer = new WebPAC::Output::Estraier( %{ $indexer_config } ); } elsif ($use_indexer eq 'hyperestraier-native') { # open Hyper Estraier database - use WebPAC::Output::EstraierNative; + require WebPAC::Output::EstraierNative; $indexer = new WebPAC::Output::EstraierNative( %{ $indexer_config } ); } elsif ($use_indexer eq 'kinosearch') { - # open KinoSearch - use WebPAC::Output::KinoSearch; - $indexer_config->{clean} = 1 unless (-e $indexer_config->{index_path}); - $indexer = new WebPAC::Output::KinoSearch( %{ $indexer_config } ); + die "no longer supported"; } else { $log->logdie("unknown use_indexer: $use_indexer"); } - $log->logide("can't continue without valid indexer") unless ($indexer); + $log->logdie("can't continue without valid indexer") unless ($indexer); } @@ -280,36 +295,60 @@ # # now WebPAC::Store # - my $abs_path = abs_path($0); - $abs_path =~ s#/[^/]*$#/#; - - my $db_path = $config->webpac('db_path'); + my $store = new WebPAC::Store({ + debug => $debug, + }); - if ($clean) { - $log->info("creating new database '$database' in $db_path"); - rmtree( $db_path ) || $log->warn("can't remove $db_path: $!"); - } else { - $log->info("working on database '$database' in $db_path"); + sub iterate_over { + my ( $what, $error ) = @_; + my @result; + if ( ref( $what ) eq 'ARRAY' ) { + @result = @{ $what }; + } elsif ($db_config->{input}) { + @result = ( $what ); + } else { + $error->() if ref($error) eq 'CODE'; + } + return @result; } - my $store = new WebPAC::Store( - path => $db_path, - debug => $debug, - ); + # + # prepare output + # + my @outputs = iterate_over( $db_config->{output}, sub { + $log->error("Database $database doesn't have any outputs defined. Do you want to remove it from configuration?" ); + } ); + + my @output_modules; + + foreach my $output ( @outputs ) { + +warn '## output = ',dump( $output ); + + my $module = $output->{module} || $log->logdie("need module in output section of $database"); + $module = 'WebPAC::Output::' . $module unless $module =~ m/::/; + + $log->debug("loading output module $module"); + eval "require $module"; + + $output->{database} = $database; + + $log->debug("calling $module->new(",dump( $output ),")"); + my $out = new $module->new( $output ); + $out->init; + + push @output_modules, $out; + } # # now, iterate through input formats # - my @inputs; - if (ref($db_config->{input}) eq 'ARRAY') { - @inputs = @{ $db_config->{input} }; - } elsif ($db_config->{input}) { - push @inputs, $db_config->{input}; - } else { + + my @inputs = iterate_over( $db_config->{input}, sub { $log->info("database $database doesn't have inputs defined"); - } + } ); foreach my $input (@inputs) { @@ -344,6 +383,7 @@ stats => $stats, modify_records => $input->{modify_records}, modify_file => $input->{modify_file}, + input_config => $input, ); $log->logdie("can't create input using $input_module") unless ($input); @@ -428,10 +468,15 @@ print $report_fh "Report for database '$database' input '$input_name' records ", $offset || 1, "-", $limit || $input->{limit} || $maxmfn, "\n\n"; $log->info("Generating report file $path"); + + if ( $validate ) { + $validate->read_validate_file( $validate->fill_in( $validate_path, database => $database, input => $input_name ) ) if ( $validate_path ); + $validate->read_validate_delimiters_file( $validate->fill_in( $validate_delimiters_path, database => $database, input => $input_name ) ) if ( $validate_delimiters_path ); + } } my $marc; - if ($parser->have_rules( 'marc', $database, $input_name )) { + if ($marc_generate && $parser->have_rules( 'marc', $database, $input_name )) { $marc = new WebPAC::Output::MARC( path => "out/marc/${database}-${input_name}.marc", lint => $marc_lint, @@ -483,7 +528,7 @@ my $mfn = $row->{'000'}->[0]; - if (! $mfn || $mfn !~ m#^\d+$#) { + if (! $mfn || $mfn !~ m{^\d+$}) { $log->warn("record $pos doesn't have valid MFN but '$mfn', using $pos"); $mfn = $pos; push @{ $row->{'000'} }, $pos; @@ -537,7 +582,7 @@ $marc->add( id => $mfn . ( $i ? "/$i" : '' ), fields => $fields, - leader => WebPAC::Normalize::marc_leader(), + leader => WebPAC::Normalize::_get_marc_leader(), row => $row, ); $i++; @@ -545,6 +590,11 @@ $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'); + } + } if ($validate) { @@ -553,6 +603,11 @@ $log->info("validation errors:\n$errors\n" ); print $report_fh "$errors\n" if ($report_fh); } + + print $report_fh "\nAll possible subfields/delimiter templates:\n", $validate->delimiters_templates( report => 1, current_input => 1 ), "\n\n"; + + # must be last thing that touches $validate for this input + $validate->reset; } if ($stats) { @@ -565,12 +620,15 @@ $marc->finish if ($marc); # close report - close($report_fh) if ($report_fh) - + close($report_fh) if ($report_fh); } eval { $indexer->finish } if ($indexer && $indexer->can('finish')); + foreach my $out ( @output_modules ) { + $out->finish if $out->can('finish'); + } + my $dt = time() - $start_t; $log->info("$total_rows records ", $indexer ? "indexed " : "", sprintf("in %.2f sec [%.2f rec/sec]", @@ -593,6 +651,9 @@ $log->info("all parallel processes finished"); } +# save new delimiters if needed +$validate->save_delimiters_templates if ( $validate_delimiters_path ); + # # handle links or merge after indexing #