--- trunk/lib/WebPAC/Input.pm 2005/12/18 23:34:30 292 +++ trunk/lib/WebPAC/Input.pm 2006/11/03 20:56:21 774 @@ -7,7 +7,8 @@ use WebPAC::Common; use base qw/WebPAC::Common/; -use Text::Iconv; +use Data::Dump qw/dump/; +use Encode qw/from_to/; =head1 NAME @@ -15,11 +16,11 @@ =head1 VERSION -Version 0.03 +Version 0.16 =cut -our $VERSION = '0.03'; +our $VERSION = '0.16'; =head1 SYNOPSIS @@ -38,19 +39,17 @@ Perhaps a little code snippet. - use WebPAC::Input; + use WebPAC::Input; - 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) { - } + my $db = WebPAC::Input->new( + module => 'WebPAC::Input::ISIS', + ); + + $db->open( path => '/path/to/database' ); + print "database size: ",$db->size,"\n"; + while (my $rec = $db->fetch) { + # do something with $rec + } @@ -62,18 +61,22 @@ my $db = new WebPAC::Input( module => 'WebPAC::Input::MARC', - code_page => 'ISO-8859-2', - low_mem => 1, + encoding => 'ISO-8859-2', + recode => 'char pairs', + no_progress_bar => 1, ); -C is low-level file format module. See L and +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,59 +90,19 @@ my $log = $self->_get_logger; - $log->logconfess("specify low-level file format module") unless ($self->{module}); - my $module = $self->{module}; - $module =~ s#::#/#g; - $module .= '.pm'; - $log->debug("require low-level module $self->{module} from $module"); - - require $module; - #eval $self->{module} .'->import'; - - # check if required subclasses are implemented - foreach my $subclass (qw/open_db fetch_rec init/) { - my $n = $self->{module} . '::' . $subclass; - if (! defined &{ $n }) { - my $missing = "missing $subclass in $self->{module}"; - $log->logwarn($missing); - $self->{$subclass} = sub { warn "$missing\n" }; - } else { - $self->{$subclass} = \&{ $n }; - } - } - - if ($self->{init}) { - $log->debug("calling init"); - $self->{init}->($self, @_); - } - - $self->{'code_page'} ||= 'ISO-8859-2'; - - # running with low_mem flag? well, use DBM::Deep then. - if ($self->{'low_mem'}) { - $log->info("running with low_mem which impacts performance (<32 Mb memory usage)"); - - my $db_file = "data.db"; - - if (-e $db_file) { - unlink $db_file or $log->logdie("can't remove '$db_file' from last run"); - $log->debug("removed '$db_file' from last run"); - } - - require DBM::Deep; - - my $db = new DBM::Deep $db_file; + $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("low_mem argument is not suppored any more. rewrite it to load_row and save_row") if ($self->{low_mem}); - $log->logdie("DBM::Deep error: $!") unless ($db); + $log->logconfess("specify low-level file format module") unless ($self->{module}); + my $module_path = $self->{module}; + $module_path =~ s#::#/#g; + $module_path .= '.pm'; + $log->debug("require low-level module $self->{module} from $module_path"); - if ($db->error()) { - $log->logdie("can't open '$db_file' under low_mem: ",$db->error()); - } else { - $log->debug("using file '$db_file' for DBM::Deep"); - } + require $module_path; - $self->{'db'} = $db; - } + $self->{'encoding'} ||= 'ISO-8859-2'; $self ? return $self : return undef; } @@ -148,20 +111,56 @@ This function will read whole database in memory and produce lookups. + my $store; # simple in-memory hash + $input->open( path => '/path/to/database/file', - code_page => '852', + code_page => 'cp852', limit => 500, offset => 6000, - lookup => $lookup_obj, + stats => 1, + lookup_coderef => sub { + my $rec = shift; + # store lookups + }, + modify_records => { + 900 => { '^a' => { ' : ' => '^b' } }, + 901 => { '*' => { '^b' => ' ; ' } }, + }, + modify_file => 'conf/modify/mapping.map', + save_row => sub { + my $a = shift; + $store->{ $a->{id} } = $a->{row}; + }, + load_row => sub { + my $a = shift; + return defined($store->{ $a->{id} }) && + $store->{ $a->{id} }; + }, + ); -By default, C is assumed to be C<852>. +By default, C is assumed to be C. C is optional parametar to position at some offset before reading from database. 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 called to save data into lookups + +C specify mapping from subfields to delimiters or from +delimiters to subfields, as well as oprations on fields (if subfield is +defined as C<*>. + +C is alternative for C above which preserves order and offers +(hopefully) simplier sintax than YAML or perl (see L). This option +overrides C if both exists for same input. + +C and C are low-level implementation of store engine. Calling convention +is documented in example above. + Returns size of database, regardless of C and C parametars, see also C. @@ -173,8 +172,14 @@ 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->debug( $arg->{lookup_coderef} ? '' : 'not ', "using lookup_coderef"); + $log->logcroak("need path") if (! $arg->{'path'}); - my $code_page = $arg->{'code_page'} || '852'; + my $code_page = $arg->{'code_page'} || 'cp852'; # store data in object $self->{'input_code_page'} = $code_page; @@ -182,50 +187,130 @@ $self->{$v} = $arg->{$v} if ($arg->{$v}); } - # create Text::Iconv object - $self->{iconv} = Text::Iconv->new($code_page,$self->{'code_page'}); + if ($arg->{load_row} || $arg->{save_row}) { + $log->logconfess("save_row and load_row must be defined in pair and be CODE") unless ( + ref($arg->{load_row}) eq 'CODE' && + ref($arg->{save_row}) eq 'CODE' + ); + $self->{load_row} = $arg->{load_row}; + $self->{save_row} = $arg->{save_row}; + $log->debug("using load_row and save_row instead of in-memory hash"); + } + + my $filter_ref; + my $recode_regex; + my $recode_map; + + 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 { + while (@r) { + my $from = shift @r; + my $to = shift @r; + $recode_map->{$from} = $to; + } + + $recode_regex = join '|' => keys %{ $recode_map }; + + $log->debug("using recode regex: $recode_regex"); + } + + } + + my $rec_regex; + if (my $p = $arg->{modify_file}) { + $log->debug("using modify_file $p"); + $rec_regex = $self->modify_file_regexps( $p ); + } elsif (my $h = $arg->{modify_records}) { + $log->debug("using modify_records ", sub { dump( $h ) }); + $rec_regex = $self->modify_record_regexps(%{ $h }); + } + $log->debug("rec_regex: ", sub { dump($rec_regex) }) if ($rec_regex); - my ($db, $size) = $self->{open_db}->( $self, + my $class = $self->{module} || $log->logconfess("can't get low-level module name!"); + + my $ll_db = $class->new( path => $arg->{path}, +# filter => sub { +# my ($l,$f_nr) = @_; +# return unless defined($l); +# from_to($l, $code_page, $self->{'encoding'}); +# $l =~ s/($recode_regex)/$recode_map->{$1}/g if ($recode_regex && $recode_map); +# return $l; +# }, + %{ $arg }, ); - unless ($db) { + unless (defined($ll_db)) { $log->logwarn("can't open database $arg->{path}, skipping..."); return; } + my $size = $ll_db->size; + unless ($size) { $log->logwarn("no records in database $arg->{path}, skipping..."); 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 ); + my $rec = $ll_db->fetch_rec($pos, sub { + my ($l,$f_nr) = @_; +# return unless defined($l); +# return $l unless ($rec_regex && $f_nr); + + $log->debug("-=> $f_nr ## $l"); + + # codepage conversion and recode_regex + from_to($l, $code_page, $self->{'encoding'}); + $l =~ s/($recode_regex)/$recode_map->{$1}/g if ($recode_regex && $recode_map); + + # apply regexps + if ($rec_regex && defined($rec_regex->{$f_nr})) { + $log->logconfess("regexps->{$f_nr} must be ARRAY") if (ref($rec_regex->{$f_nr}) ne 'ARRAY'); + my $c = 0; + foreach my $r (@{ $rec_regex->{$f_nr} }) { + my $old_l = $l; + eval '$l =~ ' . $r; + if ($old_l ne $l) { + $log->debug("REGEX on $f_nr eval \$l =~ $r\n## old l: [$old_l]\n## new l: [$l]"); + } + $log->error("error applying regex: $r") if ($@); + } + } + + $log->debug("<=- $f_nr ## $l"); + return $l; + }); + + $log->debug(sub { dump($rec) }); if (! $rec) { $log->warn("record $pos empty? skipping..."); @@ -233,16 +318,49 @@ } # store - if ($self->{low_mem}) { - $self->{db}->put($pos, $rec); + if ($self->{save_row}) { + $self->{save_row}->({ + id => $pos, + row => $rec, + }); } else { $self->{data}->{$pos} = $rec; } # 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}) { + + # fetch clean record with regexpes applied for statistics + my $rec = $ll_db->fetch_rec($pos); + + foreach my $fld (keys %{ $rec }) { + $self->{_stats}->{fld}->{ $fld }++; + + $log->logdie("invalid record fild $fld, not ARRAY") + unless (ref($rec->{ $fld }) eq 'ARRAY'); + + foreach my $row (@{ $rec->{$fld} }) { + + if (ref($row) eq 'HASH') { + + foreach my $sf (keys %{ $row }) { + next if ($sf eq 'subfields'); + $self->{_stats}->{sf}->{ $fld }->{ $sf }->{count}++; + $self->{_stats}->{sf}->{ $fld }->{ $sf }->{repeatable}++ + if (ref($row->{$sf}) eq 'ARRAY'); + } + + } else { + $self->{_stats}->{repeatable}->{ $fld }++; + } + } + } + } - $self->progress_bar($pos,$limit); + $self->progress_bar($pos,$to_rec) unless ($self->{no_progress_bar}); } @@ -250,8 +368,11 @@ $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"); + + # save for dump + $self->{ll_db} = $ll_db; return $size; } @@ -288,12 +409,12 @@ return; } - $self->progress_bar($mfn,$self->{max_pos}); + $self->progress_bar($mfn,$self->{max_pos}) unless ($self->{no_progress_bar}); my $rec; - if ($self->{low_mem}) { - $rec = $self->{db}->get($mfn); + if ($self->{load_row}) { + $rec = $self->{load_row}->({ id => $mfn }); } else { $rec = $self->{data}->{$mfn}; } @@ -363,37 +484,185 @@ 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", $_, + $s->{sf}->{$f}->{$_}->{count}, + $s->{sf}->{$f}->{$_}->{repeatable} ? '*' : '', + ); + } 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 { dump($s) } ); + + return $out; +} + +=head2 dump_ascii + +Display humanly readable dump of record + +=cut + +sub dump_ascii { + my $self = shift; + + return unless $self->{ll_db}; + + if ($self->{ll_db}->can('dump_rec')) { + return $self->{ll_db}->dump_ascii( $self->{pos} ); + } else { + return dump( $self->{ll_db}->fetch_rec( $self->{pos} ) ); + } +} + +=head2 modify_record_regexps + +Generate hash with regexpes to be applied using l. + + my $regexpes = $input->modify_record_regexps( + 900 => { '^a' => { ' : ' => '^b' } }, + 901 => { '*' => { '^b' => ' ; ' } }, + ); + +=cut -=head1 MEMORY USAGE +sub _get_regex { + my ($sf,$from,$to) = @_; + if ($sf =~ /^\^/) { + return + 's/\Q'. $sf .'\E([^\^]*?)\Q'. $from .'\E([^\^]*?)/'. $sf .'$1'. $to .'$2/'; + } else { + return + 's/\Q'. $from .'\E/'. $to .'/g'; + } +} + +sub modify_record_regexps { + my $self = shift; + my $modify_record = {@_}; + + my $regexpes; + + my $log = $self->_get_logger(); -C options is double-edged sword. If enabled, WebPAC -will run on memory constraint machines (which doesn't have enough -physical RAM to create memory structure for whole source database). - -If your machine has 512Mb or more of RAM and database is around 10000 records, -memory shouldn't be an issue. If you don't have enough physical RAM, you -might consider using virtual memory (if your operating system is handling it -well, like on FreeBSD or Linux) instead of dropping to L to handle -parsed structure of ISIS database (this is what C option does). - -Hitting swap at end of reading source database is probably o.k. However, -hitting swap before 90% will dramatically decrease performance and you will -be better off with C and using rest of availble memory for -operating system disk cache (Linux is particuallary good about this). -However, every access to database record will require disk access, so -generation phase will be slower 10-100 times. - -Parsed structures are essential - you just have option to trade RAM memory -(which is fast) for disk space (which is slow). Be sure to have planty of -disk space if you are using C and thus L. - -However, when WebPAC is running on desktop machines (or laptops :-), it's -highly undesireable for system to start swapping. Using C option can -reduce WecPAC memory usage to around 64Mb for same database with lookup -fields and sorted indexes which stay in RAM. Performance will suffer, but -memory usage will really be minimal. It might be also more confortable to -run WebPAC reniced on those machines. + foreach my $f (keys %$modify_record) { + $log->debug("field: $f"); + foreach my $sf (keys %{ $modify_record->{$f} }) { + $log->debug("subfield: $sf"); + + foreach my $from (keys %{ $modify_record->{$f}->{$sf} }) { + my $to = $modify_record->{$f}->{$sf}->{$from}; + #die "no field?" unless defined($to); + $log->debug("transform: |$from| -> |$to|"); + + my $regex = _get_regex($sf,$from,$to); + push @{ $regexpes->{$f} }, $regex; + $log->debug("regex: $regex"); + } + } + } + + return $regexpes; +} + +=head2 modify_file_regexps + +Generate hash with regexpes to be applied using l from +pseudo hash/yaml format for regex mappings. + +It should be obvious: + + 200 + '^a' + ' : ' => '^e' + ' = ' => '^d' + +In field I<200> find C<'^a'> and then C<' : '>, and replace it with C<'^e'>. +In field I<200> find C<'^a'> and then C<' = '>, and replace it with C<'^d'>. + + my $regexpes = $input->modify_file_regexps( 'conf/modify/common.pl' ); + +On undef path it will just return. + +=cut + +sub modify_file_regexps { + my $self = shift; + + my $modify_path = shift || return; + + my $log = $self->_get_logger(); + + my $regexpes; + + CORE::open(my $fh, $modify_path) || $log->logdie("can't open modify file $modify_path: $!"); + + my ($f,$sf); + + while(<$fh>) { + chomp; + next if (/^#/ || /^\s*$/); + + if (/^\s*(\d+)\s*$/) { + $f = $1; + $log->debug("field: $f"); + next; + } elsif (/^\s*'([^']*)'\s*$/) { + $sf = $1; + $log->die("can't define subfiled before field in: $_") unless ($f); + $log->debug("subfield: $sf"); + } elsif (/^\s*'([^']*)'\s*=>\s*'([^']*)'\s*$/) { + my ($from,$to) = ($1, $2); + + $log->debug("transform: |$from| -> |$to|"); + + my $regex = _get_regex($sf,$from,$to); + push @{ $regexpes->{$f} }, $regex; + $log->debug("regex: $regex"); + } + } + + return $regexpes; +} =head1 AUTHOR @@ -401,7 +670,7 @@ =head1 COPYRIGHT & LICENSE -Copyright 2005 Dobrica Pavlinusic, All Rights Reserved. +Copyright 2005-2006 Dobrica Pavlinusic, All Rights Reserved. This program is free software; you can redistribute it and/or modify it under the same terms as Perl itself.