--- trunk/lib/WebPAC/Input.pm 2006/10/10 10:57:59 757 +++ trunk/lib/WebPAC/Input.pm 2007/02/04 15:09:01 799 @@ -7,7 +7,7 @@ use WebPAC::Common; use base qw/WebPAC::Common/; -use Data::Dumper; +use Data::Dump qw/dump/; use Encode qw/from_to/; =head1 NAME @@ -16,11 +16,11 @@ =head1 VERSION -Version 0.13 +Version 0.17 =cut -our $VERSION = '0.13'; +our $VERSION = '0.17'; =head1 SYNOPSIS @@ -43,7 +43,6 @@ my $db = WebPAC::Input->new( module => 'WebPAC::Input::ISIS', - low_mem => 1, ); $db->open( path => '/path/to/database' ); @@ -63,7 +62,6 @@ my $db = new WebPAC::Input( module => 'WebPAC::Input::MARC', encoding => 'ISO-8859-2', - low_mem => 1, recode => 'char pairs', no_progress_bar => 1, ); @@ -75,8 +73,6 @@ 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. @@ -96,6 +92,7 @@ $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->logconfess("specify low-level file format module") unless ($self->{module}); my $module_path = $self->{module}; @@ -105,39 +102,8 @@ 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,6 +111,8 @@ 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', @@ -160,6 +128,16 @@ 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. @@ -180,6 +158,9 @@ (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. @@ -206,6 +187,16 @@ $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,10 +224,10 @@ $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!"); @@ -291,10 +282,11 @@ $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); + warn "-=> $f_nr ## $l\n" if ($debug); $log->debug("-=> $f_nr ## $l"); # codepage conversion and recode_regex @@ -310,16 +302,18 @@ 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]"); + warn "*** $r |$old_l| -> |$l|\n" if ($debug); } $log->error("error applying regex: $r") if ($@); } } $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 +321,11 @@ } # 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; } @@ -419,8 +416,8 @@ 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}; } @@ -475,10 +472,12 @@ 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; @@ -536,27 +535,32 @@ } sort { $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->{ll_db}->dump_rec( $self->{pos} ); + 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. +Generate hash with regexpes to be applied using L. my $regexpes = $input->modify_record_regexps( 900 => { '^a' => { ' : ' => '^b' } }, @@ -567,12 +571,22 @@ 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 =~ /^\^/) { return - 's/\Q'. $sf .'\E([^\^]*?)\Q'. $from .'\E([^\^]*?)/'. $sf .'$1'. $to .'$2/'; + 's/\Q'. $sf .'\E([^\^]*?)'. $from .'([^\^]*?)/'. $sf .'$1'. $to .'$2/'; } else { return - 's/\Q'. $from .'\E/'. $to .'/g'; + 's/'. $from .'/'. $to .'/g'; } } @@ -607,7 +621,7 @@ =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: @@ -665,37 +679,6 @@ 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<< >>