/[webpac2]/trunk/run.pl
This is repository of my old source code which isn't updated any more. Go to git.rot13.org for current projects!
ViewVC logotype

Diff of /trunk/run.pl

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 850 by dpavlin, Sun May 27 10:50:39 2007 UTC revision 864 by dpavlin, Sun May 27 22:24:30 2007 UTC
# Line 68  and subfield usage for each input Line 68  and subfield usage for each input
68    
69  turn on extra validation of imput records, see L<WebPAC::Validation>  turn on extra validation of imput records, see L<WebPAC::Validation>
70    
71    You can use special variables C<$database> and $C<$input> in this parametar
72    like C<--validate 'conf/validate/$database-$input'> to construct filename
73    
74  =item --validate-delimiters path/to/validate_delimiters_file  =item --validate-delimiters path/to/validate_delimiters_file
75    
76  this option is used with C<--validate> to turn on extra validation of  this option is used with C<--validate> to turn on extra validation of
# Line 144  GetOptions( Line 147  GetOptions(
147          "help" => \$help,          "help" => \$help,
148  );  );
149    
150    $marc_generate = 0 if ( $validate_delimiters_path );
151    
152  pod2usage(-verbose => 2) if ($help);  pod2usage(-verbose => 2) if ($help);
153    
154  my $config = new WebPAC::Config( path => $config_path );  my $config = new WebPAC::Config( path => $config_path );
# Line 172  if ($merge) { Line 177  if ($merge) {
177    
178  my $validate;  my $validate;
179  $validate = new WebPAC::Validate(  $validate = new WebPAC::Validate(
         path => $validate_path,  
180          delimiters => $config->webpac('delimiters'),          delimiters => $config->webpac('delimiters'),
         delimiters_path => $validate_delimiters_path,  
181  ) if ($validate_path || $validate_delimiters_path);  ) if ($validate_path || $validate_delimiters_path);
182    
183  my $use_indexer = $config->use_indexer;  my $use_indexer = $config->use_indexer;
# Line 209  sub create_ds_config { Line 212  sub create_ds_config {
212          return $c;          return $c;
213  }  }
214    
215  while (my ($database, $db_config) = each %{ $config->databases }) {  foreach my $database ( sort keys %{ $config->databases } ) {
216            my $db_config = $config->databases->{$database};
217    
218          my ($only_database,$only_input) = split(m#/#, $only_filter) if ($only_filter);          my ($only_database,$only_input) = split(m#/#, $only_filter) if ($only_filter);
219          next if ($only_database && $database !~ m/$only_database/i);          next if ($only_database && $database !~ m/$only_database/i);
# Line 442  while (my ($database, $db_config) = each Line 446  while (my ($database, $db_config) = each
446                          print $report_fh "Report for database '$database' input '$input_name' records ",                          print $report_fh "Report for database '$database' input '$input_name' records ",
447                                  $offset || 1, "-", $limit || $input->{limit} || $maxmfn, "\n\n";                                  $offset || 1, "-", $limit || $input->{limit} || $maxmfn, "\n\n";
448                          $log->info("Generating report file $path");                          $log->info("Generating report file $path");
449    
450                            if ( $validate ) {
451                                    $validate->read_validate_file( $validate->fill_in( $validate_path, database => $database, input => $input_name ) ) if ( $validate_path );
452                                    $validate->read_validate_delimiters_file( $validate->fill_in( $validate_delimiters_path, database => $database, input => $input_name ) ) if ( $validate_delimiters_path );
453                            }
454                  }                  }
455    
456                  my $marc;                  my $marc;
# Line 568  while (my ($database, $db_config) = each Line 577  while (my ($database, $db_config) = each
577                                  print $report_fh "$errors\n" if ($report_fh);                                  print $report_fh "$errors\n" if ($report_fh);
578                          }                          }
579    
580                          print $report_fh "\nAll possible subfields/delimiter templates:\n", $validate->delimiters_templates( report => 1 ), "\n\n";                          print $report_fh "\nAll possible subfields/delimiter templates:\n", $validate->delimiters_templates( report => 1, current_input => 1 ), "\n\n";
581    
582                            # must be last thing that touches $validate for this input
583                            $validate->reset;
584                  }                  }
585    
586                  if ($stats) {                  if ($stats) {
# Line 582  while (my ($database, $db_config) = each Line 594  while (my ($database, $db_config) = each
594    
595                  # close report                  # close report
596                  close($report_fh) if ($report_fh);                  close($report_fh) if ($report_fh);
   
                 # reset validate stats  
                 $validate->reset if ( $validate );  
597          }          }
598    
599          eval { $indexer->finish } if ($indexer && $indexer->can('finish'));          eval { $indexer->finish } if ($indexer && $indexer->can('finish'));
# Line 612  if ($parallel) { Line 621  if ($parallel) {
621  }  }
622    
623  # save new delimiters if needed  # save new delimiters if needed
624  $validate->save_delimiters_templates if ( $validate );  $validate->save_delimiters_templates if ( $validate_delimiters_path );
625    
626  #  #
627  # handle links or merge after indexing  # handle links or merge after indexing
Legend:
Removed from v.850  
changed lines
  Added in v.864
  ViewVC Help
Powered by ViewVC 1.1.26