--- trunk/IsisDB.pm	2005/01/01 22:29:35	27
+++ trunk/IsisDB.pm	2005/01/06 00:40:07	34
@@ -9,7 +9,7 @@
 BEGIN {
 	use Exporter ();
 	use vars qw ($VERSION @ISA @EXPORT @EXPORT_OK %EXPORT_TAGS);
-	$VERSION     = 0.08;
+	$VERSION     = 0.09;
 	@ISA         = qw (Exporter);
 	#Give a hoot don't pollute, do not export more than needed by default
 	@EXPORT      = qw ();
@@ -30,7 +30,7 @@
   	isisdb => './cds/cds',
   );
 
-  for(my $mfn = 1; $mfn <= $isis->{'maxmfn'}; $mfn++) {
+  for(my $mfn = 1; $mfn <= $isis->count; $mfn++) {
 	print $isis->to_ascii($mfn),"\n";
   }
 
@@ -123,8 +123,6 @@
 
 =back
 
-It will also set C<$isis-E<gt>{'maxmfn'}> which is maximum MFN stored in database.
-
 =cut
 
 sub new {
@@ -160,9 +158,10 @@
 		# read the $db.FDT file for tags
 		my $fieldzone=0;
 
-		open(fileFDT, $self->{fdt_file}) || croak "can't read '$self->{fdt_file}': $!";
+		open(my $fileFDT, $self->{fdt_file}) || croak "can't read '$self->{fdt_file}': $!";
+		binmode($fileFDT);
 
-		while (<fileFDT>) {
+		while (<$fileFDT>) {
 			chomp;
 			if ($fieldzone) {
 				my $name=substr($_,0,30);
@@ -179,12 +178,13 @@
 			}
 		}
 		
-		close(fileFDT);
+		close($fileFDT);
 	}
 
 	# Get the Maximum MFN from $db.MST
 
 	open($self->{'fileMST'}, $self->{mst_file}) || croak "can't open '$self->{mst_file}': $!";
+	binmode($self->{'fileMST'});
 
 	# MST format:	(* = 32 bit signed)
 	# CTLMFN*	always 0
@@ -192,27 +192,35 @@
 	# NXTMFB*	last block allocated to master file
 	# NXTMFP	offset to next available position in last block
 	# MFTYPE	always 0 for user db file (1 for system)
-	seek($self->{'fileMST'},4,0);
+	seek($self->{'fileMST'},4,0) || croak "can't seek to offset 0 in MST: $!";
 
 	my $buff;
 
-	read($self->{'fileMST'}, $buff, 4);
-	$self->{'NXTMFN'}=unpack("l",$buff) || carp "NXTNFN is zero";
-
-	# save maximum MFN
-	$self->{'maxmfn'} = $self->{'NXTMFN'} - 1;
-
-
-
+	read($self->{'fileMST'}, $buff, 4) || croak "can't read NXTMFN from MST: $!";
+	$self->{'NXTMFN'}=unpack("V",$buff) || croak "NXTNFN is zero";
 
 	print STDERR Dumper($self),"\n" if ($self->{debug});
 
 	# open files for later
 	open($self->{'fileXRF'}, $self->{xrf_file}) || croak "can't open '$self->{xrf_file}': $!";
+	binmode($self->{'fileXRF'});
 
 	$self ? return $self : return undef;
 }
 
+=head2 count
+
+Return number of records in database
+
+  print $isis->count;
+
+=cut
+
+sub count {
+	my $self = shift;
+	return $self->{'NXTMFN'} - 1;
+}
+
 =head2 read_cnt
 
 Read content of C<.CNT> file and return hash containing it.
@@ -232,51 +240,61 @@
 
 	# Get the index information from $db.CNT
    
-	open(fileCNT, $self->{cnt_file}) || croak "can't read '$self->{cnt_file}': $!";
-
-	# There is two 26 Bytes fixed lenght records
-
-	#  0: IDTYPE	BTree type				16
-	#  2: ORDN	Nodes Order				16
-	#  4: ORDF	Leafs Order				16
-	#  6: N		Number of Memory buffers for nodes	16
-	#  8: K		Number of buffers for first level index	16
-	# 10: LIV	Current number of Index Levels		16
-	# 12: POSRX*	Pointer to Root Record in N0x		32
-	# 16: NMAXPOS*	Next Available position in N0x		32
-	# 20: FMAXPOS*	Next available position in L0x		32
-	# 24: ABNORMAL	Formal BTree normality indicator	16
-	# length: 26 bytes
-
-	sub unpack_cnt {
-		my $self = shift;
-
-		my @flds = qw(ORDN ORDF N K LIV POSRX NMAXPOS FMAXPOS ABNORMAL);
-
-		my $buff = shift || return;
-		my @arr = unpack("ssssssllls", $buff);
-
-		print STDERR "unpack_cnt: ",join(" ",@arr),"\n" if ($self->{'debug'});
-
-		my $IDTYPE = shift @arr;
-		foreach (@flds) {
-			$self->{cnt}->{$IDTYPE}->{$_} = abs(shift @arr);
-		}
-	}
+	open(my $fileCNT, $self->{cnt_file}) || croak "can't read '$self->{cnt_file}': $!";
+	binmode($fileCNT);
 
 	my $buff;
 
-	read(fileCNT, $buff, 26);
+	read($fileCNT, $buff, 26) || croak "can't read first table from CNT: $!";
 	$self->unpack_cnt($buff);
 
-	read(fileCNT, $buff, 26);
+	read($fileCNT, $buff, 26) || croak "can't read second table from CNT: $!";
 	$self->unpack_cnt($buff);
 
-	close(fileCNT);
+	close($fileCNT);
 
 	return $self->{cnt};
 }
 
+=head2 unpack_cnt
+
+Unpack one of two 26 bytes fixed length record in C<.CNT> file.
+
+Here is definition of record:
+
+ off key	description				size
+  0: IDTYPE	BTree type				s
+  2: ORDN	Nodes Order				s
+  4: ORDF	Leafs Order				s
+  6: N		Number of Memory buffers for nodes	s
+  8: K		Number of buffers for first level index	s
+ 10: LIV	Current number of Index Levels		s
+ 12: POSRX	Pointer to Root Record in N0x		l
+ 16: NMAXPOS	Next Available position in N0x		l
+ 20: FMAXPOS	Next available position in L0x		l
+ 24: ABNORMAL	Formal BTree normality indicator	s
+ length: 26 bytes
+
+This will fill C<$self> object under C<cnt> with hash. It's used by C<read_cnt>.
+
+=cut
+
+sub unpack_cnt {
+	my $self = shift;
+
+	my @flds = qw(ORDN ORDF N K LIV POSRX NMAXPOS FMAXPOS ABNORMAL);
+
+	my $buff = shift || return;
+	my @arr = unpack("vvvvvvVVVv", $buff);
+
+	print STDERR "unpack_cnt: ",join(" ",@arr),"\n" if ($self->{'debug'});
+
+	my $IDTYPE = shift @arr;
+	foreach (@flds) {
+		$self->{cnt}->{$IDTYPE}->{$_} = abs(shift @arr);
+	}
+}
+
 =head2 fetch
 
 Read record with selected MFN
@@ -317,16 +335,17 @@
 
 	# read XRFMFB abd XRFMFP
 	read($self->{'fileXRF'}, $buff, 4);
-	my $pointer=unpack("l",$buff) || carp "pointer is null";
+	my $pointer=unpack("V",$buff) || croak "pointer is null";
 
 	# check for logically deleted record
-	if ($pointer < 0) {
+	if ($pointer & 0x80000000) {
 		print STDERR "## record $mfn is logically deleted\n" if ($self->{debug});
 		$self->{deleted} = $mfn;
 
 		return unless $self->{include_deleted};
 
-		$pointer = abs($pointer);
+		# abs
+		$pointer = ($pointer ^ 0xffffffff) + 1;
 	}
 
 	my $XRFMFB = int($pointer/2048);
@@ -341,10 +360,10 @@
 
 	# Get Record Information
 
-	seek($self->{'fileMST'},$blk_off,0);
+	seek($self->{'fileMST'},$blk_off,0) || croak "can't seek to $blk_off: $!";
 
-	read($self->{'fileMST'}, $buff, 4);
-	my $value=unpack("l",$buff);
+	read($self->{'fileMST'}, $buff, 4) || croak "can't read 4 bytes at offset $blk_off from MST file: $!";
+	my $value=unpack("V",$buff);
 
 	print STDERR "## offset for rowid $value is $blk_off (blk $XRFMFB off $XRFMFP)\n" if ($self->{debug});
 
@@ -361,7 +380,7 @@
 
 	read($self->{'fileMST'}, $buff, 14);
 
-	my ($MFRL,$MFBWB,$MFBWP,$BASE,$NVF,$STATUS) = unpack("slssss", $buff);
+	my ($MFRL,$MFBWB,$MFBWP,$BASE,$NVF,$STATUS) = unpack("vVvvvv", $buff);
 
 	print STDERR "## MFRL: $MFRL MFBWB: $MFBWB MFBWP: $MFBWP BASE: $BASE NVF: $NVF STATUS: $STATUS\n" if ($self->{debug});
 
@@ -381,7 +400,7 @@
 
 	for (my $i = 0 ; $i < $NVF ; $i++) {
 
-		my ($TAG,$POS,$LEN) = unpack("sss", substr($buff,$i * 6, 6));
+		my ($TAG,$POS,$LEN) = unpack("vvv", substr($buff,$i * 6, 6));
 
 		print STDERR "## TAG: $TAG POS: $POS LEN: $LEN\n" if ($self->{debug});