--- trunk/lib/WebPAC/Input/Excel.pm	2006/05/14 19:45:45	498
+++ trunk/lib/WebPAC/Input/Excel.pm	2006/09/29 19:52:26	728
@@ -3,9 +3,9 @@
 use warnings;
 use strict;
 
-use WebPAC::Input;
 use Spreadsheet::ParseExcel;
 use Spreadsheet::ParseExcel::Utility qw/int2col/;
+use base qw/WebPAC::Common/;
 
 =head1 NAME
 
@@ -13,11 +13,11 @@
 
 =head1 VERSION
 
-Version 0.01
+Version 0.04
 
 =cut
 
-our $VERSION = '0.01';
+our $VERSION = '0.04';
 
 
 =head1 SYNOPSIS
@@ -25,44 +25,45 @@
 Open Microsoft Excell, or compatibile format (for e.g. from OpenOffice.org
 or Gnuemeric) in C<.xls> format.
 
- my $isis = new WebPAC::Input::Excel();
- $isis->open( path => '/path/to/workbook.xls' );
-
 =head1 FUNCTIONS
 
-=head2 open_db
+=head2 new
 
 Returns handle to database and size
 
-  my ($db,$size) = $open_db(
+  my $excel = new WebPAC::Input::Excel(
   	path => '/path/to/workbook.xls'
 	worksheet => 'name of sheet',
+	from => 42,
+	to => 9999,
   }
 
 C<worksheet> is case and white-space insensitive name of worksheet in Excel
 file to use. If not specified, it will use first worksheet in file.
 
-=cut
-
-my $sheet;
+C<from> and C<to> specify row numbers to start and finish import.
 
-sub open_db {
-	my $self = shift;
+=cut
 
-	my $arg = {@_};
+sub new {
+	my $class = shift;
+	my $self = {@_};
+	bless($self, $class);
 
 	my $log = $self->_get_logger();
 
-	$log->logdie("can't open excel file $arg->{path}: $!") unless (-r $arg->{path} && -f $arg->{path});
+	$log->logdie("can't open excel file $self->{path}: $!") unless (-r $self->{path} && -f $self->{path});
 
-	my $workbook = Spreadsheet::ParseExcel::Workbook->Parse($arg->{path});
+	my $workbook = Spreadsheet::ParseExcel::Workbook->Parse($self->{path});
 
-	my ($size, $wanted_worksheet);
+	my $sheet;
+	my $wanted_worksheet;
 
-	if ($wanted_worksheet = $arg->{worksheet}) {
+	if ($wanted_worksheet = $self->{worksheet}) {
 		my $name;
 		do {
 			$sheet = shift @{ $workbook->{Worksheet} };
+			$log->logdie("can't find sheet '$wanted_worksheet' in $self->{path}\n") unless (defined($sheet));
 			$name = $sheet->{Name};
 			$name =~ s/\s\s+/ /g;
 		} until ($name =~ m/^\s*\Q$wanted_worksheet\E\s*$/i);
@@ -73,21 +74,27 @@
 	
 	}
 
-	$size = $sheet->{MaxRow} - $sheet->{MinRow};
+	$self->{sheet} = $sheet;
+
+	$self->{from} ||= $sheet->{MinRow};
+	$self->{to} ||= $sheet->{MaxRow};
+
+	my $size = $self->{to} - $self->{from};
+	$self->{size} = $size;
 
-	$log->warn("opening Excel file '$arg->{path}', using ",
+	$log->warn("opening Excel file '$self->{path}', using ",
 		$wanted_worksheet ? '' : 'first ',
 		"worksheet: $sheet->{Name} [$size rows]"
 	);
 
-	return (42, $size);
+	$self ? return $self : return undef;
 }
 
 =head2 fetch_rec
 
 Return record with ID C<$mfn> from database
 
-  my $rec = $self->fetch_rec( $db, $mfn );
+  my $rec = $self->fetch_rec( $mfn );
 
 }
 
@@ -96,16 +103,17 @@
 sub fetch_rec {
 	my $self = shift;
 
-	my (undef, $mfn) = @_;
+	my $mfn = shift;
 
 	my $log = $self->_get_logger();
 
+	my $sheet = $self->{sheet};
 	$log->logdie("can't find sheet hash") unless (defined($sheet));
 	$log->logdie("sheet hash isn't Spreadsheet::ParseExcel::Worksheet") unless ($sheet->isa('Spreadsheet::ParseExcel::Worksheet'));
 
 	my $rec;
 
-	my $row = $sheet->{MinRow} + $mfn - 1;
+	my $row = $self->{from} + $mfn - 1;
 
 	$log->debug("fetch_rec( $mfn ) row: $row cols: ",$sheet->{MinCol}," - ",$sheet->{MaxCol});
 
@@ -116,11 +124,23 @@
 	}
 
 	# add mfn only to records with data
-	$rec->{'000'} = $mfn if ($rec);
+	$rec->{'000'} = [ $mfn ] if ($rec);
 	
 	return $rec;
 }
 
+=head2 size
+
+Return number of records in database
+
+  my $size = $isis->size;
+
+=cut
+
+sub size {
+	my $self = shift;
+	return $self->{size};
+}
 =head1 AUTHOR
 
 Dobrica Pavlinusic, C<< <dpavlin@rot13.org> >>