--- trunk/run.pl 2006/05/15 17:23:38 509 +++ trunk/run.pl 2006/06/29 15:29:32 539 @@ -11,9 +11,9 @@ use WebPAC::Lookup; use WebPAC::Input 0.03; use WebPAC::Store 0.03; -use WebPAC::Normalize::XML; -use WebPAC::Normalize::Set; +use WebPAC::Normalize; use WebPAC::Output::TT; +use WebPAC::Validate; use YAML qw/LoadFile/; use Getopt::Long; use File::Path; @@ -42,24 +42,26 @@ remove database and Hyper Estraier index before indexing -=item --only=database_name +=item --only=database_name/input_filter reindex just single database (legacy name is --one) +C is optional part which can be C +or C from input + =item --config conf/config.yml path to YAML configuration file -=item --force-set - -force conversion C<< normalize->path >> in C from -C<.xml> to C<.pl> - =item --stats disable indexing and dump statistics about field and subfield usage for each input +=item --validate path/to/validation_file + +turn on extra validation of imput records, see L + =back =cut @@ -70,20 +72,20 @@ my $clean = 0; my $config = 'conf/config.yml'; my $debug = 0; -my $only_db_name; -my $force_set = 0; +my $only_filter; my $stats = 0; +my $validate_path; GetOptions( "limit=i" => \$limit, "offset=i" => \$offset, "clean" => \$clean, - "one=s" => \$only_db_name, - "only=s" => \$only_db_name, + "one=s" => \$only_filter, + "only=s" => \$only_filter, "config" => \$config, "debug" => \$debug, - "force-set" => \$force_set, "stats" => \$stats, + "validate=s" => \$validate_path, ); $config = LoadFile($config); @@ -95,6 +97,11 @@ my $log = _new WebPAC::Common()->_get_logger(); $log->info( "-" x 79 ); +my $validate; +$validate = new WebPAC::Validate( + path => $validate_path, +) if ($validate_path); + my $use_indexer = $config->{use_indexer} || 'hyperestraier'; if ($stats) { $log->debug("option --stats disables update of indexing engine..."); @@ -106,11 +113,13 @@ my $total_rows = 0; my $start_t = time(); -while (my ($database, $db_config) = each %{ $config->{databases} }) { +my @links; +my $indexer; - next if ($only_db_name && $database !~ m/$only_db_name/i); +while (my ($database, $db_config) = each %{ $config->{databases} }) { - my $indexer; + my ($only_database,$only_input) = split(m#/#, $only_filter) if ($only_filter); + next if ($only_database && $database !~ m/$only_database/i); if ($use_indexer) { my $indexer_config = $config->{$use_indexer} || $log->logdie("can't find '$use_indexer' part in confguration"); @@ -148,10 +157,10 @@ my $db_path = $config->{webpac}->{db_path} . '/' . $database; if ($clean) { - $log->info("creating new database $database in $db_path"); + $log->info("creating new database '$database' in $db_path"); rmtree( $db_path ) || $log->warn("can't remove $db_path: $!"); } else { - $log->debug("working on $database in $db_path"); + $log->info("working on database '$database' in $db_path"); } my $db = new WebPAC::Store( @@ -178,17 +187,21 @@ foreach my $input (@inputs) { + next if ($only_input && ($input->{name} !~ m#$only_input#i && $input->{type} !~ m#$only_input#i)); + my $type = lc($input->{type}); die "I know only how to handle input types ", join(",", @supported_inputs), " not '$type'!\n" unless (grep(/$type/, @supported_inputs)); my $lookup = new WebPAC::Lookup( lookup_file => $input->{lookup}, - ); + ) if ($input->{lookup}); my $input_module = $config->{webpac}->{inputs}->{$type}; - $log->info("working on input '$input->{path}' [$input->{type}] using $input_module lookup '$input->{lookup}'"); + $log->info("working on input '$input->{name}' in $input->{path} [type: $input->{type}] using $input_module", + $input->{lookup} ? "lookup '$input->{lookup}'" : "" + ); my $input_db = new WebPAC::Input( module => $input_module, @@ -204,67 +217,49 @@ my $maxmfn = $input_db->open( path => $input->{path}, code_page => $input->{encoding}, # database encoding + %{ $input }, ); - my $n = new WebPAC::Normalize::XML( - # filter => { 'foo' => sub { shift } }, - db => $db, - lookup_regex => $lookup->regex, - lookup => $lookup, - prefix => $input->{name}, - ); + my @norm_array = ref($input->{normalize}) eq 'ARRAY' ? + @{ $input->{normalize} } : ( $input->{normalize} ); - my $rules; - my $normalize_path = $input->{normalize}->{path}; + foreach my $normalize (@norm_array) { - if ($force_set) { - my $new_norm_path = $normalize_path; - $new_norm_path =~ s/\.xml$/.pl/; - if (-e $new_norm_path) { - $log->debug("--force-set replaced $normalize_path with $new_norm_path"); - $normalize_path = $new_norm_path; - } else { - $log->debug("--force-set failed on $new_norm_path, fallback to $normalize_path"); - } - } + my $rules; + my $normalize_path = $normalize->{path} || $log->logdie("can't find normalize path in config"); - if ($normalize_path =~ m/\.xml$/i) { - $n->open( - tag => $input->{normalize}->{tag}, - xml_file => $normalize_path, - ); - } elsif ($normalize_path =~ m/\.(?:yml|yaml)$/i) { - $n->open_yaml( - path => $normalize_path, - tag => $input->{normalize}->{tag}, - ); - } elsif ($normalize_path =~ m/\.(?:pl)$/i) { - $n = undef; - $log->info("using WebPAC::Normalize::Set to process $normalize_path"); - $rules = read_file( $normalize_path ) or die "can't open $normalize_path: $!"; - } + $log->logdie("Found '$normalize_path' as normalization file which isn't supported any more!") unless ( $normalize_path =~ m!\.pl$!i ); - foreach my $pos ( 0 ... $input_db->size ) { + my $rules = read_file( $normalize_path ) or die "can't open $normalize_path: $!"; - my $row = $input_db->fetch || next; + $log->info("Using $normalize_path for normalization..."); - my $mfn = $row->{'000'}->[0]; + # reset position in database + $input_db->seek(1); - if (! $mfn || $mfn !~ m#^\d+$#) { - $log->warn("record $pos doesn't have valid MFN but '$mfn', using $pos"); - $mfn = $pos; - push @{ $row->{'000'} }, $pos; - } + foreach my $pos ( 0 ... $input_db->size ) { - - my $ds; - if ($n) { - $ds = $n->data_structure($row); - } else { - $ds = WebPAC::Normalize::Set::data_structure( + my $row = $input_db->fetch || next; + + my $mfn = $row->{'000'}->[0]; + + if (! $mfn || $mfn !~ m#^\d+$#) { + $log->warn("record $pos doesn't have valid MFN but '$mfn', using $pos"); + $mfn = $pos; + push @{ $row->{'000'} }, $pos; + } + + + if ($validate) { + my @errors = $validate->validate_errors( $row ); + $log->error( "MFN $mfn validation errors:\n", join("\n", @errors) ) if (@errors); + } + + + my $ds = WebPAC::Normalize::data_structure( row => $row, rules => $rules, - lookup => $lookup->lookup_hash, + lookup => $lookup ? $lookup->lookup_hash : undef, ); $db->save_ds( @@ -272,26 +267,27 @@ ds => $ds, prefix => $input->{name}, ) if ($ds && !$stats); - } - $indexer->add( - id => $input->{name} . "/" . $mfn, - ds => $ds, - type => $config->{$use_indexer}->{type}, - ) if ($indexer); + $indexer->add( + id => $input->{name} . "/" . $mfn, + ds => $ds, + type => $config->{$use_indexer}->{type}, + ) if ($indexer); - $total_rows++; - } + $total_rows++; + } - $log->info("statistics of fields usage:\n", $input_db->stats) if ($stats); + $log->info("statistics of fields usage:\n", $input_db->stats) if ($stats); - }; + }; + + } eval { $indexer->finish } if ($indexer && $indexer->can('finish')); my $dt = time() - $start_t; - $log->info("$total_rows records indexed in " . - sprintf("%.2f sec [%.2f rec/sec]", + $log->info("$total_rows records ", $indexer ? "indexed " : "", + sprintf("in %.2f sec [%.2f rec/sec]", $dt, ($total_rows / $dt) ) ); @@ -302,12 +298,12 @@ if (ref($db_config->{links}) eq 'ARRAY') { foreach my $link (@{ $db_config->{links} }) { if ($use_indexer eq 'hyperestraier') { - $log->info("adding link $database -> $link->{to} [$link->{credit}]"); - $indexer->add_link( + $log->info("saving link $database -> $link->{to} [$link->{credit}]"); + push @links, { from => $database, to => $link->{to}, credit => $link->{credit}, - ); + }; } else { $log->warn("NOT IMPLEMENTED WITH $use_indexer: adding link $database -> $link->{to} [$link->{credit}]"); } @@ -316,3 +312,7 @@ } +foreach my $link (@links) { + $log->info("adding link $link->{from} -> $link->{to} [$link->{credit}]"); + $indexer->add_link( %{ $link } ); +}