--- trunk/IsisDB.pm	2004/12/30 23:16:20	19
+++ trunk/IsisDB.pm	2004/12/31 07:16:02	26
@@ -9,7 +9,7 @@
 BEGIN {
 	use Exporter ();
 	use vars qw ($VERSION @ISA @EXPORT @EXPORT_OK %EXPORT_TAGS);
-	$VERSION     = 0.07;
+	$VERSION     = 0.08;
 	@ISA         = qw (Exporter);
 	#Give a hoot don't pollute, do not export more than needed by default
 	@EXPORT      = qw ();
@@ -296,7 +296,7 @@
 
 	# is mfn allready in memory?
 	my $old_mfn = $self->{'current_mfn'} || -1;
-	return if ($mfn == $old_mfn);
+	return $self->{record} if ($mfn == $old_mfn);
 
 	print STDERR "## fetch: $mfn\n" if ($self->{debug});
 
@@ -308,18 +308,30 @@
 
 	my $buff;
 
+	# delete old record
+	delete $self->{record};
+
 	# read XRFMFB abd XRFMFP
 	read($self->{'fileXRF'}, $buff, 4);
 	my $pointer=unpack("l",$buff) || carp "pointer is null";
 
+	# check for logically deleted record
+	if ($pointer < 0) {
+		print STDERR "## record $mfn is logically deleted\n" if ($self->{debug});
+		$self->{deleted} = $mfn;
+
+		return unless $self->{include_deleted};
+
+		$pointer = abs($pointer);
+	}
+
 	my $XRFMFB = int($pointer/2048);
 	my $XRFMFP = $pointer - ($XRFMFB*2048);
 
-
 	# (XRFMFB - 1) * 512 + XRFMFP
 	# why do i have to do XRFMFP % 1024 ?
 
-	my $blk_off = (($XRFMFB - 1) * 512) + ($XRFMFP % 1024);
+	my $blk_off = (($XRFMFB - 1) * 512) + ($XRFMFP % 512);
 
 	print STDERR "## pointer: $pointer XRFMFB: $XRFMFB XRFMFP: $XRFMFP offset: $blk_off\n" if ($self->{'debug'});
 
@@ -333,16 +345,15 @@
 	print STDERR "## offset for rowid $value is $blk_off (blk $XRFMFB off $XRFMFP)\n" if ($self->{debug});
 
 	if ($value!=$mfn) {
-		carp "Error: MFN ".$mfn." not found in MST(".$value.")";    
-		#return;		# XXX deleted record?
-	}
+		if ($value == 0) {
+			print STDERR "## record $mfn is physically deleted\n" if ($self->{debug});
+			$self->{deleted} = $mfn;
+			return;
+		}
 
-#	$MFRL=$self->Read16($fileMST);
-#	$MFBWB=$self->Read32($fileMST);
-#	$MFBWP=$self->Read16($fileMST);
-#	$BASE=$self->Read16($fileMST);
-#	$NVF=$self->Read16($fileMST);
-#	$STATUS=$self->Read16($fileMST);
+		carp "Error: MFN ".$mfn." not found in MST file, found $value";    
+		return;
+	}
 
 	read($self->{'fileMST'}, $buff, 14);
 
@@ -350,14 +361,7 @@
 
 	print STDERR "## MFRL: $MFRL MFBWB: $MFBWB MFBWP: $MFBWP BASE: $BASE NVF: $NVF STATUS: $STATUS\n" if ($self->{debug});
 
-	# delete old record
-	delete $self->{record};
-
-	## FIXME this is a bug
-	if (! $self->{'include_deleted'} && $MFRL < 0) {
-		print "## logically deleted record $mfn, skipping...\n" if ($self->{debug});
-		return;
-	}
+	warn "MFRL $MFRL is not even number" unless ($MFRL % 2 == 0);
 
 	warn "BASE is not 18+6*NVF" unless ($BASE == 18 + 6 * $NVF);
 
@@ -373,10 +377,6 @@
 
 	for (my $i = 0 ; $i < $NVF ; $i++) {
 
-#		$TAG=$self->Read16($fileMST);
-#		$POS=$self->Read16($fileMST);
-#		$LEN=$self->Read16($fileMST);
-
 		my ($TAG,$POS,$LEN) = unpack("sss", substr($buff,$i * 6, 6));
 
 		print STDERR "## TAG: $TAG POS: $POS LEN: $LEN\n" if ($self->{debug});
@@ -413,7 +413,7 @@
 
 	$self->{'current_mfn'} = $mfn;
 
-	print Dumper($self),"\n" if ($self->{debug});
+	print STDERR Dumper($self),"\n" if ($self->{debug});
 
 	return $self->{'record'};
 }
@@ -520,7 +520,7 @@
 			my $val;
 
 			# has identifiers?
-			($val->{'i1'},$val->{'i2'}) = ($1,$2) if ($l =~ s/^([01 #])([01 #])//);
+			($val->{'i1'},$val->{'i2'}) = ($1,$2) if ($l =~ s/^([01 #])([01 #])\^/\^/);
 
 			# has subfields?
 			if ($l =~ m/\^/) {