--- trunk/IsisDB.pm 2005/01/06 00:40:07 34 +++ trunk/lib/Biblio/Isis.pm 2006/07/08 16:03:52 56 @@ -1,15 +1,13 @@ -package IsisDB; +package Biblio::Isis; use strict; use Carp; use File::Glob qw(:globally :nocase); -use Data::Dumper; - BEGIN { use Exporter (); use vars qw ($VERSION @ISA @EXPORT @EXPORT_OK %EXPORT_TAGS); - $VERSION = 0.09; + $VERSION = 0.20; @ISA = qw (Exporter); #Give a hoot don't pollute, do not export more than needed by default @EXPORT = qw (); @@ -20,13 +18,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 +79,7 @@ Open ISIS database - my $isis = new IsisDB( + my $isis = new Biblio::Isis( isisdb => './cds/cds', read_fdt => 1, include_deleted => 1, @@ -119,7 +117,7 @@ =item debug -Dump a B of debugging output. +Dump a B of debugging output even at level 1. For even more increase level. =back @@ -147,10 +145,22 @@ 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}); + if ($self->{debug}) { + print STDERR "## using files: ",join(" ",@isis_files),"\n"; + eval "use Data::Dump"; + + if (! $@) { + *Dumper = *Data::Dump::dump; + } else { + use Data::Dumper; + } + } # if you want to read .FDT file use read_fdt argument when creating class! if ($self->{read_fdt} && -e $self->{fdt_file}) { @@ -199,7 +209,7 @@ 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}); + print STDERR "## self ",Dumper($self),"\n" if ($self->{debug}); # open files for later open($self->{'fileXRF'}, $self->{xrf_file}) || croak "can't open '$self->{xrf_file}': $!"; @@ -221,80 +231,6 @@ return $self->{'NXTMFN'} - 1; } -=head2 read_cnt - -Read content of C<.CNT> file and return hash containing it. - - print Dumper($isis->read_cnt); - -This function is not used by module (C<.CNT> files are not required for this -module to work), but it can be useful to examine your index (while debugging -for example). - -=cut - -sub read_cnt { - my $self = shift; - - croak "missing CNT file in ",$self->{isisdb} unless ($self->{cnt_file}); - - # Get the index information from $db.CNT - - open(my $fileCNT, $self->{cnt_file}) || croak "can't read '$self->{cnt_file}': $!"; - binmode($fileCNT); - - my $buff; - - read($fileCNT, $buff, 26) || croak "can't read first table from CNT: $!"; - $self->unpack_cnt($buff); - - read($fileCNT, $buff, 26) || croak "can't read second table from CNT: $!"; - $self->unpack_cnt($buff); - - 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 with hash. It's used by C. - -=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 @@ -335,7 +271,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) { @@ -441,6 +385,24 @@ return $self->{'record'}; } +=head2 mfn + +Returns current MFN position + + my $mfn = $isis->mfn; + +=cut + +# This function should be simple return $self->{current_mfn}, +# but if new is called with _hack_mfn it becomes setter. +# It's useful in tests when setting $isis->{record} directly + +sub mfn { + my $self = shift; + return $self->{current_mfn}; +}; + + =head2 to_ascii Returns ASCII output of record with specified MFN @@ -464,7 +426,7 @@ my $mfn = shift || croak "need MFN"; - my $rec = $self->fetch($mfn); + my $rec = $self->fetch($mfn) || return; my $out = "0\t$mfn"; @@ -520,25 +482,49 @@ } ], +In case there are repeatable subfields in record, this will create +following structure: + + '900' => [ { + 'a' => [ 'foo', 'bar', 'baz' ], + }] + This method will also create additional field C<000> with MFN. +There is also more elaborative way to call C like this: + + my $hash = $isis->to_hash({ + mfn => 42, + include_empty_subfields => 1, + }); + =cut sub to_hash { my $self = shift; + my $mfn = shift || confess "need mfn!"; + my $arg; + + if (ref($mfn) eq 'HASH') { + $arg = $mfn; + $mfn = $arg->{mfn} || confess "need mfn in arguments"; + } # 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; @@ -549,7 +535,21 @@ if ($l =~ m/\^/) { foreach my $t (split(/\^/,$l)) { next if (! $t); - $val->{substr($t,0,1)} = substr($t,1); + my ($sf,$v) = (substr($t,0,1), substr($t,1)); + # FIXME make this option ! + next unless ($v); +# warn "### $k^$sf:$v",$/ if ($self->{debug} > 1); + + # FIXME array return optional, by default unroll to ' ; ' + if (ref( $val->{$sf} ) eq 'ARRAY') { + + push @{ $val->{$sf} }, $v; + } elsif (defined( $val->{$sf} )) { + # convert scalar field to array + $val->{$sf} = [ $val->{$sf}, $v ]; + } else { + $val->{$sf} = $v; + } } } else { $val = $l; @@ -576,6 +576,81 @@ return $self->{'TagName'}->{$tag} || $tag; } + +=head2 read_cnt + +Read content of C<.CNT> file and return hash containing it. + + print Dumper($isis->read_cnt); + +This function is not used by module (C<.CNT> files are not required for this +module to work), but it can be useful to examine your index (while debugging +for example). + +=cut + +sub read_cnt { + my $self = shift; + + croak "missing CNT file in ",$self->{isisdb} unless ($self->{cnt_file}); + + # Get the index information from $db.CNT + + open(my $fileCNT, $self->{cnt_file}) || croak "can't read '$self->{cnt_file}': $!"; + binmode($fileCNT); + + my $buff; + + read($fileCNT, $buff, 26) || croak "can't read first table from CNT: $!"; + $self->unpack_cnt($buff); + + read($fileCNT, $buff, 26) || croak "can't read second table from CNT: $!"; + $self->unpack_cnt($buff); + + 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 with hash. It's used by C. + +=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); + } +} + 1; =head1 BUGS @@ -593,6 +668,19 @@ tested this against ouput of one C-based application, but I don't know any details about it's version. +=head1 VERSIONS + +You can find version dependencies documented here + +=over 8 + +=item 0.20 + +Added C<< $isis->mfn >>, support for repeatable subfields and +C<< $isis->to_hash({ mfn => 42, ... }) >> calling convention + +=back + =head1 AUTHOR Dobrica Pavlinusic