/[webpac2]/trunk/lib/WebPAC/Validate.pm
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/lib/WebPAC/Validate.pm

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

revision 857 by dpavlin, Sun May 27 16:49:15 2007 UTC revision 864 by dpavlin, Sun May 27 22:24:30 2007 UTC
# Line 106  sub read_validate_file { Line 106  sub read_validate_file {
106                  $log->logdie("can't open validate path $path: $!");                  $log->logdie("can't open validate path $path: $!");
107    
108          my $v;          my $v;
109            delete( $self->{must_exist} );
110            delete( $self->{must_exist_sf} );
111            delete( $self->{dont_validate} );
112          my $curr_line = 1;          my $curr_line = 1;
113    
114          foreach my $l (split(/[\n\r]+/, $v_file)) {          foreach my $l (split(/[\n\r]+/, $v_file)) {
# Line 165  sub read_validate_delimiters_file { Line 168  sub read_validate_delimiters_file {
168    
169          my $log = $self->_get_logger();          my $log = $self->_get_logger();
170    
171            delete( $self->{_validate_delimiters_templates} );
172            delete( $self->{_delimiters_templates} );
173    
174          if ( -e $path ) {          if ( -e $path ) {
175                  $log->info("using delimiter validation rules from $path");                  $log->info("using delimiter validation rules from $path");
176                  open(my $d, $path) || $log->fatal("can't open $path: $!");                  open(my $d, $path) || $log->fatal("can't open $path: $!");
# Line 182  sub read_validate_delimiters_file { Line 188  sub read_validate_delimiters_file {
188          } else {          } else {
189                  $log->warn("delimiters path $path doesn't exist, it will be created after this run");                  $log->warn("delimiters path $path doesn't exist, it will be created after this run");
190          }          }
191            $self->{delimiters_path} = $path;
192  }  }
193    
194  =head2 validate_rec  =head2 validate_rec
# Line 366  sub reset { Line 373  sub reset {
373                                  $self->{_delimiters_templates}->{$f}->{$t};                                  $self->{_delimiters_templates}->{$f}->{$t};
374                  }                  }
375          }          }
376          $log->debug("_accumulated_delimiters_templates = ", sub { dump( $self->{_accumulated_delimiter_templates} ) } );          $log->debug("_accumulated_delimiters_templates = ", sub { dump( $self->{_accumulated_delimiters_templates} ) } );
377          delete ($self->{_delimiters_templates});          delete ($self->{_delimiters_templates});
378  }  }
379    
# Line 560  Save accumulated delimiter templates Line 567  Save accumulated delimiter templates
567  sub save_delimiters_templates {  sub save_delimiters_templates {
568          my $self = shift;          my $self = shift;
569    
570          my $path = $self->{delimiters_path};          my $path = shift;
571            $path ||= $self->{delimiters_path};
         return unless ( $path );  
572    
573          my $log = $self->_get_logger;          my $log = $self->_get_logger;
574    
575            $log->logdie("need path") unless ( $path );
576    
577    
578          if ( ! $self->{_accumulated_delimiters_templates} ) {          if ( ! $self->{_accumulated_delimiters_templates} ) {
579                  $log->error('no _accumulated_delimiters_templates found, reset');                  $log->error('no _accumulated_delimiters_templates found, reset');
580                  $self->reset;                  $self->reset;
581          }          }
582    
583          if ( ! $self->{_delimiters_templates} ) {          if ( $self->{_delimiters_templates} ) {
584                  $log->error('found _delimiters_templates, calling reset');                  $log->error('found _delimiters_templates, calling reset');
585                  $self->reset;                  $self->reset;
586          }          }
Legend:
Removed from v.857  
changed lines
  Added in v.864
  ViewVC Help
Powered by ViewVC 1.1.26