--- trunk/lib/WebPAC/Input.pm 2005/12/18 22:16:44 289 +++ trunk/lib/WebPAC/Input.pm 2006/07/05 19:52:45 585 @@ -8,6 +8,7 @@ use WebPAC::Common; use base qw/WebPAC::Common/; use Text::Iconv; +use Data::Dumper; =head1 NAME @@ -15,11 +16,11 @@ =head1 VERSION -Version 0.03 +Version 0.07 =cut -our $VERSION = '0.03'; +our $VERSION = '0.07'; =head1 SYNOPSIS @@ -43,14 +44,14 @@ my $db = WebPAC::Input->new( module => 'WebPAC::Input::ISIS', config => $config, - lookup => $lookup_obj, low_mem => 1, ); $db->open('/path/to/database'); - print "database size: ",$db->size,"\n"; - while (my $rec = $db->fetch) { - } + print "database size: ",$db->size,"\n"; + while (my $rec = $db->fetch) { + # do something with $rec + } @@ -62,19 +63,26 @@ my $db = new WebPAC::Input( module => 'WebPAC::Input::MARC', - code_page => 'ISO-8859-2', + encoding => 'ISO-8859-2', low_mem => 1, + recode => 'char pairs', + no_progress_bar => 1, ); C is low-level file format module. See L and L. -Optional parametar C specify application code page (which will be +Optional parametar C specify application code page (which will be used internally). This should probably be your terminal encoding, and by default, it C. Default is not to use C options (see L below). +C is optional string constisting of character or words pairs that +should be replaced in input stream. + +C disables progress bar output on C + This function will also call low-level C if it exists with same parametars. @@ -87,6 +95,9 @@ my $log = $self->_get_logger; + $log->logconfess("code_page argument is not suppored any more. change it to encoding") if ($self->{lookup}); + $log->logconfess("lookup argument is not suppored any more. rewrite call to lookup_ref") if ($self->{lookup}); + $log->logconfess("specify low-level file format module") unless ($self->{module}); my $module = $self->{module}; $module =~ s#::#/#g; @@ -100,7 +111,8 @@ foreach my $subclass (qw/open_db fetch_rec init/) { my $n = $self->{module} . '::' . $subclass; if (! defined &{ $n }) { - $log->logwarn("missing implementation of $subclass"); + my $missing = "missing $subclass in $self->{module}"; + $self->{$subclass} = sub { $log->logwarn($missing) }; } else { $self->{$subclass} = \&{ $n }; } @@ -111,7 +123,7 @@ $self->{init}->($self, @_); } - $self->{'code_page'} ||= 'ISO-8859-2'; + $self->{'encoding'} ||= 'ISO-8859-2'; # running with low_mem flag? well, use DBM::Deep then. if ($self->{'low_mem'}) { @@ -152,6 +164,11 @@ limit => 500, offset => 6000, lookup => $lookup_obj, + stats => 1, + lookup_ref => sub { + my ($k,$v) = @_; + # store lookup $k => $v + }, ); By default, C is assumed to be C<852>. @@ -160,6 +177,11 @@ C is optional parametar to read just C records from database +C create optional report about usage of fields and subfields + +C is closure to call when adding key => $value combinations to +lookup. + Returns size of database, regardless of C and C parametars, see also C. @@ -171,23 +193,57 @@ my $log = $self->_get_logger(); + $log->logconfess("lookup argument is not suppored any more. rewrite call to lookup_coderef") if ($arg->{lookup}); + $log->logconfess("lookup_coderef must be CODE, not ",ref($arg->{lookup_coderef})) + if ($arg->{lookup_coderef} && ref($arg->{lookup_coderef}) ne 'CODE'); + $log->logcroak("need path") if (! $arg->{'path'}); my $code_page = $arg->{'code_page'} || '852'; # store data in object - $self->{'code_page'} = $code_page; + $self->{'input_code_page'} = $code_page; foreach my $v (qw/path offset limit/) { $self->{$v} = $arg->{$v} if ($arg->{$v}); } # create Text::Iconv object - $self->{iconv} = Text::Iconv->new($code_page,$self->{'code_page'}); + $self->{iconv} = Text::Iconv->new($code_page,$self->{'encoding'}); ## FIXME remove! + + my $filter_ref; + + if ($self->{recode}) { + my @r = split(/\s/, $self->{recode}); + if ($#r % 2 != 1) { + $log->logwarn("recode needs even number of elements (some number of valid pairs)"); + } else { + my $recode; + while (@r) { + my $from = shift @r; + my $to = shift @r; + $recode->{$from} = $to; + } + + my $regex = join '|' => keys %{ $recode }; + + $log->debug("using recode regex: $regex"); + + $filter_ref = sub { + my $t = shift; + $t =~ s/($regex)/$recode->{$1}/g; + return $t; + }; + + } + + } my ($db, $size) = $self->{open_db}->( $self, path => $arg->{path}, + filter => $filter_ref, + %{ $arg }, ); - unless ($db) { + unless (defined($db)) { $log->logwarn("can't open database $arg->{path}, skipping..."); return; } @@ -197,34 +253,36 @@ return; } - my $offset = 1; - my $limit = $size; + my $from_rec = 1; + my $to_rec = $size; if (my $s = $self->{offset}) { - $log->info("skipping to MFN $s"); - $offset = $s; + $log->debug("skipping to MFN $s"); + $from_rec = $s; } else { - $self->{offset} = $offset; + $self->{offset} = $from_rec; } if ($self->{limit}) { - $log->info("limiting to ",$self->{limit}," records"); - $limit = $offset + $self->{limit} - 1; - $limit = $size if ($limit > $size); + $log->debug("limiting to ",$self->{limit}," records"); + $to_rec = $from_rec + $self->{limit} - 1; + $to_rec = $size if ($to_rec > $size); } # store size for later - $self->{size} = ($limit - $offset) ? ($limit - $offset + 1) : 0; + $self->{size} = ($to_rec - $from_rec) ? ($to_rec - $from_rec + 1) : 0; - $log->info("processing $self->{size} records in $code_page, convert to $self->{code_page}"); + $log->info("processing $self->{size}/$size records [$from_rec-$to_rec] convert $code_page -> $self->{encoding}", $self->{stats} ? ' [stats]' : ''); # read database - for (my $pos = $offset; $pos <= $limit; $pos++) { + for (my $pos = $from_rec; $pos <= $to_rec; $pos++) { $log->debug("position: $pos\n"); my $rec = $self->{fetch_rec}->($self, $db, $pos ); + $log->debug(sub { Dumper($rec) }); + if (! $rec) { $log->warn("record $pos empty? skipping..."); next; @@ -238,9 +296,28 @@ } # create lookup - $self->{'lookup'}->add( $rec ) if ($rec && $self->{'lookup'}); + $arg->{'lookup_coderef'}->( $rec ) if ($rec && $arg->{'lookup_coderef'}); + + # update counters for statistics + if ($self->{stats}) { + map { + my $fld = $_; + $self->{_stats}->{fld}->{ $fld }++; + if (ref($rec->{ $fld }) eq 'ARRAY') { + map { + if (ref($_) eq 'HASH') { + map { + $self->{_stats}->{sf}->{ $fld }->{ $_ }++; + } keys %{ $_ }; + } else { + $self->{_stats}->{repeatable}->{ $fld }++; + } + } @{ $rec->{$fld} }; + } + } keys %{ $rec }; + } - $self->progress_bar($pos,$limit); + $self->progress_bar($pos,$to_rec) unless ($self->{no_progress_bar}); } @@ -248,8 +325,8 @@ $self->{last_pcnt} = 0; # store max mfn and return it. - $self->{max_pos} = $limit; - $log->debug("max_pos: $limit"); + $self->{max_pos} = $to_rec; + $log->debug("max_pos: $to_rec"); return $size; } @@ -286,7 +363,7 @@ return; } - $self->progress_bar($mfn,$self->{max_pos}); + $self->progress_bar($mfn,$self->{max_pos}) unless ($self->{no_progress_bar}); my $rec; @@ -361,6 +438,53 @@ return $self->{pos} = (($pos - 1) || -1); } +=head2 stats + +Dump statistics about field and subfield usage + + print $input->stats; + +=cut + +sub stats { + my $self = shift; + + my $log = $self->_get_logger(); + + my $s = $self->{_stats}; + if (! $s) { + $log->warn("called stats, but there is no statistics collected"); + return; + } + + my $max_fld = 0; + + my $out = join("\n", + map { + my $f = $_ || die "no field"; + my $v = $s->{fld}->{$f} || die "no s->{fld}->{$f}"; + $max_fld = $v if ($v > $max_fld); + + my $o = sprintf("%4s %d ~", $f, $v); + + if (defined($s->{sf}->{$f})) { + map { + $o .= sprintf(" %s:%d", $_, $s->{sf}->{$f}->{$_}); + } sort keys %{ $s->{sf}->{$f} }; + } + + if (my $v_r = $s->{repeatable}->{$f}) { + $o .= " ($v_r)" if ($v_r != $v); + } + + $o; + } sort { $a cmp $b } keys %{ $s->{fld} } + ); + + $log->debug( sub { Dumper($s) } ); + + return $out; +} =head1 MEMORY USAGE