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

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

revision 29 by dpavlin, Sun Jul 24 11:17:44 2005 UTC revision 31 by dpavlin, Sun Jul 24 15:03:11 2005 UTC
# Line 81  Create new normalisation object Line 81  Create new normalisation object
81          },          },
82          db => $db_obj,          db => $db_obj,
83          lookup_regex => $lookup->regex,          lookup_regex => $lookup->regex,
84            lookup => $lookup_obj,
85    );    );
86    
87  Parametar C<filter> defines user supplied snippets of perl code which can  Parametar C<filter> defines user supplied snippets of perl code which can
88  be use with C<filter{...}> notation.  be use with C<filter{...}> notation.
89    
90  Recommended parametar C<lookup_regex> is used to enable parsing of lookups  Recommended parametar C<lookup_regex> is used to enable parsing of lookups
91  in structures.  in structures. If you pass this parametar, you must also pass C<lookup>
92    which is C<WebPAC::Lookup> object.
93    
94  =cut  =cut
95    
# Line 96  sub new { Line 98  sub new {
98          my $self = {@_};          my $self = {@_};
99          bless($self, $class);          bless($self, $class);
100    
101            my $r = $self->{'lookup_regex'} ? 1 : 0;
102            my $l = $self->{'lookup'} ? 1 : 0;
103    
104            my $log = $self->_get_logger();
105    
106            # those two must be in pair
107            if ( ($r & $l) != ($r || $l) ) {
108                    my $log = $self->_get_logger();
109                    $log->logdie("lookup_regex and lookup must be in pair");
110            }
111    
112            $log->logdie("lookup must be WebPAC::Lookup object") if ($self->{'lookup'} && ! $self->{'lookup'}->isa('WebPAC::Lookup'));
113    
114          $self ? return $self : return undef;          $self ? return $self : return undef;
115  }  }
116    
# Line 443  sub fill_in { Line 458  sub fill_in {
458                  }                  }
459                  # do we have lookups?                  # do we have lookups?
460                  if ($self->{'lookup'}) {                  if ($self->{'lookup'}) {
461                          return $self->lookup($format);                          if ($self->{'lookup'}->can('lookup')) {
462                                    return $self->{'lookup'}->lookup($format);
463                            } else {
464                                    $log->warn("Have lookup object but can't invoke lookup method");
465                            }
466                  } else {                  } else {
467                          return $format;                          return $format;
468                  }                  }
# Line 569  sub apply_format { Line 588  sub apply_format {
588          $log->debug("using format $name [$format] on $data to produce: $out");          $log->debug("using format $name [$format] on $data to produce: $out");
589    
590          if ($self->{'lookup_regex'} && $out =~ $self->{'lookup_regex'}) {          if ($self->{'lookup_regex'} && $out =~ $self->{'lookup_regex'}) {
591                  return $self->lookup($out);                  return $self->{'lookup'}->lookup($out);
592          } else {          } else {
593                  return $out;                  return $out;
594          }          }

Legend:
Removed from v.29  
changed lines
  Added in v.31

  ViewVC Help
Powered by ViewVC 1.1.26