--- nfo/perl/libs/Tangram/AbstractHash.pm 2002/11/25 00:06:22 1.2 +++ nfo/perl/libs/Tangram/AbstractHash.pm 2003/05/10 17:48:16 1.3 @@ -5,7 +5,8 @@ package Tangram::AbstractHash; use Tangram::Coll; -use base qw( Tangram::Coll ); +use vars qw(@ISA); + @ISA = qw( Tangram::Coll ); use Carp; @@ -20,7 +21,7 @@ my ($self, $def, $storage, $obj, $member, $class) = @_; print $Tangram::TRACE "loading $member\n" if $Tangram::TRACE; - + my %coll; if (my $prefetch = $storage->{PREFETCH}{$class}{$member}{$storage->id($obj)}) @@ -30,7 +31,7 @@ else { my $cursor = $self->cursor($def, $storage, $obj, $member); - + for (my $item = $cursor->select; $item; $item = $cursor->next) { my $slot = shift @{ $cursor->{-residue} }; @@ -38,7 +39,7 @@ } } - $self->set_load_state($storage, $obj, $member, map { $_ => ($coll{$_} && $storage->id( $coll{$_} ) ) } keys %coll ); + $self->set_load_state($storage, $obj, $member, { map { $_ => ($coll{$_} && $storage->id( $coll{$_} ) ) } keys %coll } ); return \%coll; }