/[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 261 by dpavlin, Fri Dec 16 16:00:18 2005 UTC revision 317 by dpavlin, Fri Dec 23 21:37:05 2005 UTC
# Line 11  WebPAC::Normalize - data mungling for no Line 11  WebPAC::Normalize - data mungling for no
11    
12  =head1 VERSION  =head1 VERSION
13    
14  Version 0.06  Version 0.08
15    
16  =cut  =cut
17    
18  our $VERSION = '0.06';  our $VERSION = '0.08';
19    
20  =head1 SYNOPSIS  =head1 SYNOPSIS
21    
# Line 123  sub new { Line 123  sub new {
123    
124          $log->debug("using lookup regex: ", $self->{lookup_regex}) if ($r && $l);          $log->debug("using lookup regex: ", $self->{lookup_regex}) if ($r && $l);
125    
126          if ($self->{filter} && ! $self->{filter}->{regex}) {          if (! $self->{filter} || ! $self->{filter}->{regex}) {
127                  $log->debug("adding built-in filter regex");                  $log->debug("adding built-in filter regex");
128                  $self->{filter}->{regex} = sub {                  $self->{filter}->{regex} = sub {
129                          my ($val, $regex) = @_;                          my ($val, $regex) = @_;
# Line 157  sub data_structure { Line 157  sub data_structure {
157    
158          $log->debug("data_structure rec = ", sub { Dumper($rec) });          $log->debug("data_structure rec = ", sub { Dumper($rec) });
159    
160          $log->logdie("need unique ID (mfn) in field 000 of record ", sub { Dumper($rec) } ) unless (defined($rec->{'000'}));          $log->logdie("need unique ID (mfn) in field 000 of record " . Dumper($rec) ) unless (defined($rec->{'000'}));
161    
162          my $id = $rec->{'000'}->[0] || $log->logdie("field 000 isn't array!");          my $id = $rec->{'000'}->[0] || $log->logdie("field 000 isn't array!");
163    
# Line 170  sub data_structure { Line 170  sub data_structure {
170                  $log->debug("cache miss, creating");                  $log->debug("cache miss, creating");
171          }          }
172    
         undef $self->{'currnet_filename'};  
         undef $self->{'headline'};  
   
173          my @sorted_tags;          my @sorted_tags;
174          if ($self->{tags_by_order}) {          if ($self->{tags_by_order}) {
175                  @sorted_tags = @{$self->{tags_by_order}};                  @sorted_tags = @{$self->{tags_by_order}};
# Line 330  sub parse { Line 327  sub parse {
327          # remove filter{...} from beginning          # remove filter{...} from beginning
328          $filter_name = $1 if ($format =~ s/^filter{([^}]+)}//s);          $filter_name = $1 if ($format =~ s/^filter{([^}]+)}//s);
329    
330            # did we found any (att all) field from format in row?
331            my $found_any = 0;
332            # prefix before first field which we preserve it $found_any
333          my $prefix;          my $prefix;
334          my $all_found=0;  
335            my $f_step = 1;
336    
337          while ($format =~ s/^(.*?)(v|s)(\d+)(?:\^(\w))?//s) {          while ($format =~ s/^(.*?)(v|s)(\d+)(?:\^(\w))?//s) {
338    
339                  my $del = $1 || '';                  my $del = $1 || '';
340                  $prefix ||= $del if ($all_found == 0);                  $prefix = $del if ($f_step == 1);
341    
342                  # repeatable index                  # repeatable index
343                  my $r = $i;                  my $r = $i;
# Line 346  sub parse { Line 347  sub parse {
347                  my $tmp = $self->get_data(\$rec,$3,$4,$r,\$found);                  my $tmp = $self->get_data(\$rec,$3,$4,$r,\$found);
348    
349                  if ($found) {                  if ($found) {
350                          push @out, $del;                          $found_any += $found;
351    
352                            # we will skip delimiter before first occurence of field!
353                            push @out, $del unless($found_any == 1);
354                          push @out, $tmp;                          push @out, $tmp;
                         $all_found += $found;  
355                  }                  }
356                    $f_step++;
357          }          }
358    
359          return if (! $all_found);          return if (! $found_any);
360    
361          my $out = join('',@out);          my $out = join('',@out);
362    

Legend:
Removed from v.261  
changed lines
  Added in v.317

  ViewVC Help
Powered by ViewVC 1.1.26