--- trunk/lib/WebPAC/Input.pm	2005/12/18 23:34:30	292
+++ 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
 
@@ -101,8 +100,7 @@
 		my $n = $self->{module} . '::' . $subclass;
 		if (! defined &{ $n }) {
 			my $missing = "missing $subclass in $self->{module}";
-			$log->logwarn($missing);
-			$self->{$subclass} = sub { warn "$missing\n" };
+			$self->{$subclass} = sub { $log->logwarn($missing) };
 		} else {
 			$self->{$subclass} = \&{ $n };
 		}
@@ -199,34 +197,36 @@
 		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}->($self, $db, $pos );
 
+		$log->debug(sub { Dumper($rec) });
+
 		if (! $rec) {
 			$log->warn("record $pos empty? skipping...");
 			next;
@@ -242,7 +242,7 @@
 		# create lookup
 		$self->{'lookup'}->add( $rec ) if ($rec && $self->{'lookup'});
 
-		$self->progress_bar($pos,$limit);
+		$self->progress_bar($pos,$to_rec);
 
 	}
 
@@ -250,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;
 }