--- trunk/Estraier.pm 2006/02/19 17:01:49 107 +++ trunk/Estraier.pm 2006/03/12 15:20:06 112 @@ -4,7 +4,7 @@ use strict; use warnings; -our $VERSION = '0.04_2'; +our $VERSION = '0.04'; =head1 NAME @@ -789,7 +789,7 @@ return $self->{hints}->{$key}; } -=head2 hits +=head2 hints More perlish version of C. This one returns hash. @@ -874,14 +874,12 @@ my $self = { pxport => -1, timeout => 0, # this used to be -1 - dnum => -1, - wnum => -1, - size => -1.0, wwidth => 480, hwidth => 96, awidth => 96, status => -1, }; + bless($self, $class); if ($#_ == 0) { @@ -894,6 +892,12 @@ warn "## Node debug on\n" if ($self->{debug}); } + $self->{inform} = { + dnum => -1, + wnum => -1, + size => -1.0, + }; + $self ? return $self : return undef; } @@ -1270,8 +1274,8 @@ sub name { my $self = shift; - $self->_set_info unless ($self->{name}); - return $self->{name}; + $self->_set_info unless ($self->{inform}->{name}); + return $self->{inform}->{name}; } @@ -1283,8 +1287,8 @@ sub label { my $self = shift; - $self->_set_info unless ($self->{label}); - return $self->{label}; + $self->_set_info unless ($self->{inform}->{label}); + return $self->{inform}->{label}; } @@ -1296,8 +1300,8 @@ sub doc_num { my $self = shift; - $self->_set_info if ($self->{dnum} < 0); - return $self->{dnum}; + $self->_set_info if ($self->{inform}->{dnum} < 0); + return $self->{inform}->{dnum}; } @@ -1309,8 +1313,8 @@ sub word_num { my $self = shift; - $self->_set_info if ($self->{wnum} < 0); - return $self->{wnum}; + $self->_set_info if ($self->{inform}->{wnum} < 0); + return $self->{inform}->{wnum}; } @@ -1322,8 +1326,8 @@ sub size { my $self = shift; - $self->_set_info if ($self->{size} < 0); - return $self->{size}; + $self->_set_info if ($self->{inform}->{size} < 0); + return $self->{inform}->{size}; } @@ -1680,8 +1684,8 @@ sub admins { my $self = shift; - $self->_set_info unless ($self->{name}); - return $self->{admins}; + $self->_set_info unless ($self->{inform}->{name}); + return $self->{inform}->{admins}; } =head2 guests @@ -1694,8 +1698,8 @@ sub guests { my $self = shift; - $self->_set_info unless ($self->{name}); - return $self->{guests}; + $self->_set_info unless ($self->{inform}->{name}); + return $self->{inform}->{guests}; } =head2 links @@ -1708,8 +1712,8 @@ sub links { my $self = shift; - $self->_set_info unless ($self->{name}); - return $self->{links}; + $self->_set_info unless ($self->{inform}->{name}); + return $self->{inform}->{links}; } @@ -1741,24 +1745,26 @@ return if ($rv != 200 || !$resbody); my @lines = split(/[\r\n]/,$resbody); - - ( $self->{name}, $self->{label}, $self->{dnum}, $self->{wnum}, $self->{size} ) = - split(/\t/, shift @lines, 5); + + $self->{inform} = {}; + + ( $self->{inform}->{name}, $self->{inform}->{label}, $self->{inform}->{dnum}, + $self->{inform}->{wnum}, $self->{inform}->{size} ) = split(/\t/, shift @lines, 5); return $resbody unless (@lines); shift @lines; while(my $admin = shift @lines) { - push @{$self->{admins}}, $admin; + push @{$self->{inform}->{admins}}, $admin; } - + while(my $guest = shift @lines) { - push @{$self->{guests}}, $guest; + push @{$self->{inform}->{guests}}, $guest; } while(my $link = shift @lines) { - push @{$self->{links}}, $link; + push @{$self->{inform}->{links}}, $link; } return $resbody;