--- trunk/lib/WebPAC/Input.pm	2006/09/25 09:49:28	697
+++ trunk/lib/WebPAC/Input.pm	2006/09/29 19:52:17	726
@@ -16,11 +16,11 @@
 
 =head1 VERSION
 
-Version 0.12
+Version 0.13
 
 =cut
 
-our $VERSION = '0.12';
+our $VERSION = '0.13';
 
 =head1 SYNOPSIS
 
@@ -98,28 +98,16 @@
 	$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;
-	$module .= '.pm';
-	$log->debug("require low-level module $self->{module} from $module");
+	my $module_path = $self->{module};
+	$module_path =~ s#::#/#g;
+	$module_path .= '.pm';
+	$log->debug("require low-level module $self->{module} from $module_path");
 
-	require $module;
-	#eval $self->{module} .'->import';
+	require $module_path;
 
 	# check if required subclasses are implemented
 	foreach my $subclass (qw/open_db fetch_rec init dump_rec/) {
-		my $n = $self->{module} . '::' . $subclass;
-		if (! defined &{ $n }) {
-			my $missing = "missing $subclass in $self->{module}";
-			$self->{$subclass} = sub { $log->logwarn($missing) };
-		} else {
-			$self->{$subclass} = \&{ $n };
-		}
-	}
-
-	if ($self->{init}) {
-		$log->debug("calling init");
-		$self->{init}->($self, @_);
+		# FIXME
 	}
 
 	$self->{'encoding'} ||= 'ISO-8859-2';
@@ -162,11 +150,10 @@
 	code_page => 'cp852',
 	limit => 500,
 	offset => 6000,
-	lookup => $lookup_obj,
 	stats => 1,
-	lookup_ref => sub {
-		my ($k,$v) = @_;
-		# store lookup $k => $v
+	lookup_coderef => sub {
+		my $rec = shift;
+		# store lookups
 	},
 	modify_records => {
 		900 => { '^a' => { ' : ' => '^b' } },
@@ -183,8 +170,7 @@
 
 C<stats> create optional report about usage of fields and subfields
 
-C<lookup_coderef> is closure to call when adding C<< key => 'value' >> combinations to
-lookup.
+C<lookup_coderef> is closure to called to save data into lookups
 
 C<modify_records> specify mapping from subfields to delimiters or from
 delimiters to subfields, as well as oprations on fields (if subfield is
@@ -209,6 +195,8 @@
 	$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'} || 'cp852';
 
@@ -250,7 +238,9 @@
 	}
 	$log->debug("rec_regex: ", Dumper($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) = @_;
@@ -262,11 +252,13 @@
 		%{ $arg },
 	);
 
-	unless (defined($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;
@@ -298,7 +290,7 @@
 
 		$log->debug("position: $pos\n");
 
-		my $rec = $self->{fetch_rec}->($self, $pos, sub {
+		my $rec = $ll_db->fetch_rec($pos, sub {
 				my ($l,$f_nr) = @_;
 #				return unless defined($l);
 #				return $l unless ($rec_regex && $f_nr);
@@ -348,7 +340,7 @@
 		if ($self->{stats}) {
 
 			# fetch clean record with regexpes applied for statistics
-			my $rec = $self->{fetch_rec}->($self, $pos);
+			my $rec = $ll_db->fetch_rec($pos);
 
 			foreach my $fld (keys %{ $rec }) {
 				$self->{_stats}->{fld}->{ $fld }++;