X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=lib%2FWebPAC%2FInput.pm;h=218a9696ca0c4555746c4dc163f4d1a62bf9bd51;hb=640203e47fc3ef06a8b73b01bdb9ee76a2baa569;hp=7ac1a7c8b7eade95286dba0bb5bfaf0d495621a3;hpb=26af493eb8ff6590a5f8c0664ea5ab4d93e6abeb;p=webpac2 diff --git a/lib/WebPAC/Input.pm b/lib/WebPAC/Input.pm index 7ac1a7c..218a969 100644 --- a/lib/WebPAC/Input.pm +++ b/lib/WebPAC/Input.pm @@ -7,20 +7,16 @@ use blib; use WebPAC::Common; use base qw/WebPAC::Common/; -use Data::Dumper; -use Encode qw/from_to/; +use Data::Dump qw/dump/; +use Encode qw/decode from_to/; =head1 NAME WebPAC::Input - read different file formats into WebPAC -=head1 VERSION - -Version 0.13 - =cut -our $VERSION = '0.13'; +our $VERSION = '0.19'; =head1 SYNOPSIS @@ -43,7 +39,6 @@ Perhaps a little code snippet. my $db = WebPAC::Input->new( module => 'WebPAC::Input::ISIS', - low_mem => 1, ); $db->open( path => '/path/to/database' ); @@ -62,21 +57,16 @@ Create new input database object. my $db = new WebPAC::Input( module => 'WebPAC::Input::MARC', - encoding => 'ISO-8859-2', - low_mem => 1, recode => 'char pairs', no_progress_bar => 1, + input_config => { + mapping => [ 'foo', 'bar', 'baz' ], + }, ); C is low-level file format module. See L and L. -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. @@ -94,8 +84,10 @@ sub new { 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("code_page argument is not suppored any more.") if $self->{code_page}; + $log->logconfess("encoding argument is not suppored any more.") if $self->{encoding}; + $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->logconfess("specify low-level file format module") unless ($self->{module}); my $module_path = $self->{module}; @@ -105,39 +97,6 @@ sub new { require $module_path; - # check if required subclasses are implemented - foreach my $subclass (qw/open_db fetch_rec init dump_rec/) { - # FIXME - } - - $self->{'encoding'} ||= '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->logdie("DBM::Deep error: $!") unless ($db); - - 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"); - } - - $self->{'db'} = $db; - } - $self ? return $self : return undef; } @@ -145,9 +104,12 @@ sub new { 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 => 'cp852', + input_encoding => 'cp852', + strict_encoding => 0, limit => 500, offset => 6000, stats => 1, @@ -160,9 +122,19 @@ This function will read whole database in memory and produce lookups. 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. +By default, C is assumed to be C. C is optional parametar to position at some offset before reading from database. @@ -180,6 +152,11 @@ C is alternative for C above which preserves order (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. + +C should really default to 1, but it doesn't for now. + Returns size of database, regardless of C and C parametars, see also C. @@ -190,7 +167,10 @@ sub open { my $arg = {@_}; my $log = $self->_get_logger(); + $log->debug( "arguments: ",dump( $arg )); + $log->logconfess("encoding argument is not suppored any more.") if $self->{encoding}; + $log->logconfess("code_page argument is not suppored any more.") if $self->{code_page}; $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'); @@ -198,14 +178,23 @@ sub open { $log->debug( $arg->{lookup_coderef} ? '' : 'not ', "using lookup_coderef"); $log->logcroak("need path") if (! $arg->{'path'}); - my $code_page = $arg->{'code_page'} || 'cp852'; + my $input_encoding = $arg->{'input_encoding'} || $self->{'input_encoding'} || 'cp852'; # store data in object - $self->{'input_code_page'} = $code_page; foreach my $v (qw/path offset limit/) { $self->{$v} = $arg->{$v} if ($arg->{$v}); } + 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; @@ -233,19 +222,20 @@ sub open { $log->debug("using modify_file $p"); $rec_regex = $self->modify_file_regexps( $p ); } elsif (my $h = $arg->{modify_records}) { - $log->debug("using modify_records ", Dumper( $h )); + $log->debug("using modify_records ", sub { dump( $h ) }); $rec_regex = $self->modify_record_regexps(%{ $h }); } - $log->debug("rec_regex: ", Dumper($rec_regex)) if ($rec_regex); + $log->debug("rec_regex: ", sub { dump($rec_regex) }) if ($rec_regex); my $class = $self->{module} || $log->logconfess("can't get low-level module name!"); my $ll_db = $class->new( path => $arg->{path}, + input_config => $arg->{input_config} || $self->{input_config}, # filter => sub { # my ($l,$f_nr) = @_; # return unless defined($l); -# from_to($l, $code_page, $self->{'encoding'}); +# $l = decode($input_encoding, $l); # $l =~ s/($recode_regex)/$recode_map->{$1}/g if ($recode_regex && $recode_map); # return $l; # }, @@ -283,7 +273,12 @@ sub open { # store size for later $self->{size} = ($to_rec - $from_rec) ? ($to_rec - $from_rec + 1) : 0; - $log->info("processing $self->{size}/$size records [$from_rec-$to_rec] convert $code_page -> $self->{encoding}", $self->{stats} ? ' [stats]' : ''); + my $strict_encoding = $arg->{strict_encoding} || $self->{strict_encoding}; ## FIXME should be 1 really + + $log->info("processing $self->{size}/$size records [$from_rec-$to_rec]", + " encoding $input_encoding ", $strict_encoding ? ' [strict]' : '', + $self->{stats} ? ' [stats]' : '', + ); # read database for (my $pos = $from_rec; $pos <= $to_rec; $pos++) { @@ -291,14 +286,18 @@ sub open { $log->debug("position: $pos\n"); my $rec = $ll_db->fetch_rec($pos, sub { - my ($l,$f_nr) = @_; + my ($l,$f_nr,$debug) = @_; # return unless defined($l); # return $l unless ($rec_regex && $f_nr); + return unless ( defined($l) && defined($f_nr) ); + + warn "-=> $f_nr ## |$l|\n" if ($debug); $log->debug("-=> $f_nr ## $l"); # codepage conversion and recode_regex - from_to($l, $code_page, $self->{'encoding'}); +# $l = decode($input_encoding, $l, 1); + from_to( $l, $input_encoding, 'utf-8', 1 ); $l =~ s/($recode_regex)/$recode_map->{$1}/g if ($recode_regex && $recode_map); # apply regexps @@ -307,19 +306,26 @@ sub open { my $c = 0; foreach my $r (@{ $rec_regex->{$f_nr} }) { my $old_l = $l; - eval '$l =~ ' . $r; + $log->logconfess("expected regex in ", dump( $r )) unless defined($r->{regex}); + eval '$l =~ ' . $r->{regex}; if ($old_l ne $l) { - $log->debug("REGEX on $f_nr eval \$l =~ $r\n## old l: [$old_l]\n## new l: [$l]"); + my $d = "|$old_l| -> |$l| "; # . $r->{regex}; + $d .= ' +' . $r->{line} . ' ' . $r->{file} if defined($r->{line}); + $d .= ' ' . $r->{debug} if defined($r->{debug}); + $log->debug("MODIFY $d"); + warn "*** $d\n" if ($debug); + } $log->error("error applying regex: $r") if ($@); } } - $log->debug("<=- $f_nr ## $l"); + $log->debug("<=- $f_nr ## |$l|"); + warn "<=- $f_nr ## $l\n" if ($debug); return $l; }); - $log->debug(sub { Dumper($rec) }); + $log->debug(sub { dump($rec) }); if (! $rec) { $log->warn("record $pos empty? skipping..."); @@ -327,8 +333,11 @@ sub open { } # 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; } @@ -345,8 +354,8 @@ sub open { foreach my $fld (keys %{ $rec }) { $self->{_stats}->{fld}->{ $fld }++; - $log->logdie("invalid record fild $fld, not ARRAY") - unless (ref($rec->{ $fld }) eq 'ARRAY'); + #$log->logdie("invalid record fild $fld, not ARRAY") + next unless (ref($rec->{ $fld }) eq 'ARRAY'); foreach my $row (@{ $rec->{$fld} }) { @@ -377,6 +386,9 @@ sub open { $self->{max_pos} = $to_rec; $log->debug("max_pos: $to_rec"); + # save for dump + $self->{ll_db} = $ll_db; + return $size; } @@ -416,8 +428,8 @@ sub fetch { 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}; } @@ -472,10 +484,12 @@ First record in database has position 1. sub seek { my $self = shift; - my $pos = shift || return; + my $pos = shift; my $log = $self->_get_logger(); + $log->logconfess("called without pos") unless defined($pos); + if ($pos < 1) { $log->warn("seek before first record"); $pos = 1; @@ -510,19 +524,26 @@ sub stats { my $out = join("\n", map { - my $f = $_ || die "no field"; + my $f = $_; + die "no field in ", dump( $s->{fld} ) unless defined( $f ); 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})) { + my @subfields = keys %{ $s->{sf}->{$f} }; map { $o .= sprintf(" %s:%d%s", $_, $s->{sf}->{$f}->{$_}->{count}, $s->{sf}->{$f}->{$_}->{repeatable} ? '*' : '', ); - } sort keys %{ $s->{sf}->{$f} }; + } ( + # first indicators and other special subfields + sort( grep { length($_) > 1 } @subfields ), + # then subfileds (single char) + sort( grep { length($_) == 1 } @subfields ), + ); } if (my $v_r = $s->{repeatable}->{$f}) { @@ -530,49 +551,87 @@ sub stats { } $o; - } sort { $a cmp $b } keys %{ $s->{fld} } + } sort { + if ( $a =~ m/^\d+$/ && $b =~ m/^\d+$/ ) { + $a <=> $b + } else { + $a cmp $b + } + } keys %{ $s->{fld} } ); - $log->debug( sub { Dumper($s) } ); + $log->debug( sub { dump($s) } ); return $out; } -=head2 dump +=head2 dump_ascii Display humanly readable dump of record =cut -sub dump { +sub dump_ascii { my $self = shift; - return $self->{dump_rec}->($self, $self->{pos}); + return unless $self->{ll_db}; + if ($self->{ll_db}->can('dump_ascii')) { + return $self->{ll_db}->dump_ascii( $self->{pos} ); + } else { + return dump( $self->{ll_db}->fetch_rec( $self->{pos} ) ); + } } -=head2 modify_record_regexps +=head2 _get_regex -Generate hash with regexpes to be applied using l. +Helper function called which create regexps to be execute on code. - my $regexpes = $input->modify_record_regexps( - 900 => { '^a' => { ' : ' => '^b' } }, - 901 => { '*' => { '^b' => ' ; ' } }, - ); + _get_regex( 900, 'regex:[0-9]+' ,'numbers' ); + _get_regex( 900, '^b', ' : ^b' ); + +It supports perl regexps with C prefix to from value and has +additional logic to skip empty subfields. =cut sub _get_regex { my ($sf,$from,$to) = @_; + + # protect / + $from =~ s!/!\\/!gs; + $to =~ s!/!\\/!gs; + + if ($from =~ m/^regex:(.+)$/) { + $from = $1; + } else { + $from = '\Q' . $from . '\E'; + } if ($sf =~ /^\^/) { + my $need_subfield_data = '*'; # no + # if from is also subfield, require some data in between + # to correctly skip empty subfields + $need_subfield_data = '+' if ($from =~ m/^\\Q\^/); return - 's/\Q'. $sf .'\E([^\^]*?)\Q'. $from .'\E([^\^]*?)/'. $sf .'$1'. $to .'$2/'; + 's/\Q'. $sf .'\E([^\^]' . $need_subfield_data . '?)'. $from .'([^\^]*?)/'. $sf .'$1'. $to .'$2/'; } else { return - 's/\Q'. $from .'\E/'. $to .'/g'; + 's/'. $from .'/'. $to .'/g'; } } + +=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 + sub modify_record_regexps { my $self = shift; my $modify_record = {@_}; @@ -590,10 +649,11 @@ sub modify_record_regexps { 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 $d = "|$from| -> |$to|"; + $log->debug("transform: $d"); my $regex = _get_regex($sf,$from,$to); - push @{ $regexpes->{$f} }, $regex; + push @{ $regexpes->{$f} }, { regex => $regex, debug => $d }; $log->debug("regex: $regex"); } } @@ -604,7 +664,7 @@ sub modify_record_regexps { =head2 modify_file_regexps -Generate hash with regexpes to be applied using l from +Generate hash with regexpes to be applied using L from pseudo hash/yaml format for regex mappings. It should be obvious: @@ -654,7 +714,11 @@ sub modify_file_regexps { $log->debug("transform: |$from| -> |$to|"); my $regex = _get_regex($sf,$from,$to); - push @{ $regexpes->{$f} }, $regex; + push @{ $regexpes->{$f} }, { + regex => $regex, + file => $modify_path, + line => $., + }; $log->debug("regex: $regex"); } } @@ -662,37 +726,6 @@ sub modify_file_regexps { return $regexpes; } -=head1 MEMORY USAGE - -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. - - =head1 AUTHOR Dobrica Pavlinusic, C<< >>