--- trunk/IsisDB.pm	2005/01/06 16:27:07	35
+++ trunk/lib/Biblio/Isis.pm	2006/07/06 11:02:37	44
@@ -1,4 +1,4 @@
-package IsisDB;
+package Biblio::Isis;
 use strict;
 
 use Carp;
@@ -9,7 +9,7 @@
 BEGIN {
 	use Exporter ();
 	use vars qw ($VERSION @ISA @EXPORT @EXPORT_OK %EXPORT_TAGS);
-	$VERSION     = 0.09;
+	$VERSION     = 0.13;
 	@ISA         = qw (Exporter);
 	#Give a hoot don't pollute, do not export more than needed by default
 	@EXPORT      = qw ();
@@ -20,13 +20,13 @@
 
 =head1 NAME
 
-IsisDB - Read CDS/ISIS, WinISIS and IsisMarc database
+Biblio::Isis - Read CDS/ISIS, WinISIS and IsisMarc database
 
 =head1 SYNOPSIS
 
-  use IsisDB;
+  use Biblio::Isis;
 
-  my $isis = new IsisDB(
+  my $isis = new Biblio::Isis(
   	isisdb => './cds/cds',
   );
 
@@ -81,7 +81,7 @@
 
 Open ISIS database
 
- my $isis = new IsisDB(
+ my $isis = new Biblio::Isis(
  	isisdb => './cds/cds',
 	read_fdt => 1,
 	include_deleted => 1,
@@ -147,7 +147,10 @@
 	push @must_exist, "fdt" if ($self->{read_fdt});
 
 	foreach my $ext (@must_exist) {
-		croak "missing ",uc($ext)," file in ",$self->{isisdb} unless ($self->{$ext."_file"});
+		unless ($self->{$ext."_file"}) {
+			carp "missing ",uc($ext)," file in ",$self->{isisdb};
+			return;
+		}
 	}
 
 	print STDERR "## using files: ",join(" ",@isis_files),"\n" if ($self->{debug});
@@ -261,7 +264,15 @@
 
 	# read XRFMFB abd XRFMFP
 	read($self->{'fileXRF'}, $buff, 4);
-	my $pointer=unpack("V",$buff) || croak "pointer is null";
+	my $pointer=unpack("V",$buff);
+	if (! $pointer) {
+		if ($self->{include_deleted}) {
+			return;
+		} else {
+			warn "pointer for MFN $mfn is null\n";
+			return;
+		}
+	}
 
 	# check for logically deleted record
 	if ($pointer & 0x80000000) {
@@ -390,7 +401,7 @@
 
 	my $mfn = shift || croak "need MFN";
 
-	my $rec = $self->fetch($mfn);
+	my $rec = $self->fetch($mfn) || return;
 
 	my $out = "0\t$mfn";
 
@@ -458,13 +469,16 @@
 	# init record to include MFN as field 000
 	my $rec = { '000' => [ $mfn ] };
 
-	my $row = $self->fetch($mfn);
+	my $row = $self->fetch($mfn) || return;
 
 	foreach my $k (keys %{$row}) {
 		foreach my $l (@{$row->{$k}}) {
 
 			# filter output
-			$l = $self->{'hash_filter'}->($l) if ($self->{'hash_filter'});
+			if ($self->{'hash_filter'}) {
+				$l = $self->{'hash_filter'}->($l);
+				next unless defined($l);
+			}
 
 			my $val;