--- trunk/lib/WebPAC/Input.pm	2005/12/18 21:06:51	287
+++ trunk/lib/WebPAC/Input.pm	2005/12/31 16:50:11	339
@@ -3,11 +3,10 @@
 use warnings;
 use strict;
 
-use blib;
-
 use WebPAC::Common;
 use base qw/WebPAC::Common/;
 use Text::Iconv;
+use Data::Dumper;
 
 =head1 NAME
 
@@ -92,21 +91,24 @@
 	$module =~ s#::#/#g;
 	$module .= '.pm';
 	$log->debug("require low-level module $self->{module} from $module");
+
 	require $module;
-	eval $self->{module} .'->import';
+	#eval $self->{module} .'->import';
 
 	# check if required subclasses are implemented
-	foreach my $subclass (qw/open_db fetch_rec/) {
-		if ( $self->can($subclass) ) {
-			$log->debug("imported $subclass");
+	foreach my $subclass (qw/open_db fetch_rec init/) {
+		my $n = $self->{module} . '::' . $subclass;
+		if (! defined &{ $n }) {
+			my $missing = "missing $subclass in $self->{module}";
+			$self->{$subclass} = sub { $log->logwarn($missing) };
 		} else {
-			$log->warn("missing $subclass in $self->{module}");
+			$self->{$subclass} = \&{ $n };
 		}
 	}
 
-	if ($self->can('init')) {
+	if ($self->{init}) {
 		$log->debug("calling init");
-		$self->init(@_);
+		$self->{init}->($self, @_);
 	}
 
 	$self->{'code_page'} ||= 'ISO-8859-2';
@@ -173,7 +175,7 @@
 	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});
 	}
@@ -181,7 +183,7 @@
 	# create Text::Iconv object
 	$self->{iconv} = Text::Iconv->new($code_page,$self->{'code_page'});
 
-	my ($db, $size) = $self->open_db(
+	my ($db, $size) = $self->{open_db}->( $self, 
 		path => $arg->{path},
 	);
 
@@ -195,33 +197,35 @@
 		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;
+		$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->{code_page}");
 
 	# 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( $db, $pos );
+		my $rec = $self->{fetch_rec}->($self, $db, $pos );
+
+		$log->debug(sub { Dumper($rec) });
 
 		if (! $rec) {
 			$log->warn("record $pos empty? skipping...");
@@ -238,7 +242,7 @@
 		# create lookup
 		$self->{'lookup'}->add( $rec ) if ($rec && $self->{'lookup'});
 
-		$self->progress_bar($pos,$limit);
+		$self->progress_bar($pos,$to_rec);
 
 	}
 
@@ -246,8 +250,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;
 }