use strict;
use vars qw($VERSION $BRANCH);
-$VERSION = sprintf( "%d.%03d", q$Revision$ =~ /(\d+)\.(\d+)/ );
-$BRANCH = sprintf( "%d.%03d", q$Revision$ =~ /\d+\.\d+\.(\d+)\.(\d+)/ ) || 0;
-$main::build += $VERSION;
-$main::branch += $BRANCH;
+
+main::mkver($VERSION = q$Revision$);
use vars qw(%list %valid @ISA $max $filterdef);
@ISA = qw(Route);
users => '0,Users,parray',
usercount => '0,User Count',
version => '0,Version',
- pc90 => '0,Using PC90,yesno',
- lastpc90 => '0,Last PC90 time,cldatetime',
+ build => '0,Build',
+ sw => '0,Software',
+ np => '0,Using New Prot,yesno',
);
$filterdef = $Route::filterdef;
# object with that callsign. The upper layers are expected to do something
# sensible with this!
#
-# called as $parent->add(call, dxchan, version, flags)
+# called as $parent->add(call, version, flags)
#
sub add
my $parent = shift;
my $call = uc shift;
confess "Route::add trying to add $call to myself" if $call eq $parent->{call};
+ my $version = shift;
+ my $here = shift;
+
my $self = get($call);
if ($self) {
$self->_addparent($parent);
$parent->_addnode($self);
+ if ($self->{version} != $version || $self->{flags} != $here) {
+ $self->{version} = $version;
+ $self->{flags} = $here;
+ return $self;
+ }
return undef;
}
- $self = $parent->new($call, @_);
+ $self = $parent->new($call, $version, $here);
$parent->_addnode($self);
return $self;
}
my $uref = Route::User::get($ucall);
my @out;
if ($uref) {
- @out = $uref->addparent($self);
+ push @out, $uref->addparent($self);
} else {
$uref = Route::User->new($ucall, $self->{call}, @_);
- @out = $uref;
+ push @out, $uref;
}
$self->_adduser($uref);
$self->{usercount} = scalar @{$self->{users}};
return @out;
}
+# return the differences in nodes between what we currently have and
+# the list proffered. Returns two refs one to a list of nodes to remove and
+# the other a list of nodes to add
+#
+# input is a list of callsigns (not refs)
+sub diff_nodes
+{
+ my $self = shift;
+ my $in = ref $_[0] ? shift : \@_;
+ my %del = map {($_, 1)} nodes($self);
+ my %in = map {($_, 1)} @$in;
+
+ # remove all the calls that are in both lists
+ for (@$in) {
+ delete $in{$_} if delete $del{$_};
+ }
+ return ([keys %del], [keys %in]);
+}
+
+# same as above but for users
+sub diff_users
+{
+ my $self = shift;
+ my $in = ref $_[0] ? shift : \@_;
+ my %del = map {($_, 1)} users($self);
+ my %in = map {($_, 1)} @$in;
+
+ # remove all the calls that are in both lists
+ for (@$in) {
+ delete $in{$_} if delete $del{$_};
+ }
+ return ([keys %del], [keys %in]);
+}
sub new
{
my $self = $pkg->SUPER::new($call);
$self->{parent} = ref $pkg ? [ $pkg->{call} ] : [ ];
- $self->{version} = shift;
- $self->{flags} = shift;
+ $self->{version} = 0 || shift;
+ $self->{flags} = 0 || shift;
$self->{users} = [];
$self->{nodes} = [];
+ $self->{lid} = 0;
$list{$call} = $self;
return values %list;
}
+sub newid
+{
+ my $self = shift;
+ my $id = shift;
+
+ return 0 if $id == $self->{lid};
+ if ($id > $self->{lid}) {
+ $self->{lid} = $id;
+ return 1;
+ } elsif ($self->{lid} - $id > 500) {
+ $self->{id} = $id;
+ return 1;
+ }
+ return 0;
+}
+
sub _addparent
{
my $self = shift;
return $self->_dellist('users', @_);
}
-sub DESTROY
-{
- my $self = shift;
- my $pkg = ref $self;
- my $call = $self->{call} || "Unknown";
-
- dbg("destroying $pkg with $call") if isdbg('routelow');
-}
-
#
# generic AUTOLOAD for accessors
#
sub AUTOLOAD
{
no strict;
-
- my $self = shift;
- $name = $AUTOLOAD;
+ my $name = $AUTOLOAD;
return if $name =~ /::DESTROY$/;
- $name =~ s/.*:://o;
+ $name =~ s/^.*:://o;
confess "Non-existant field '$AUTOLOAD'" unless $valid{$name} || $Route::valid{$name};
# this clever line of code creates a subroutine which takes over from autoload
# from OO Perl - Conway
-# print "AUTOLOAD: $AUTOLOAD\n";
-# *{$AUTOLOAD} = sub {my $self = shift; @_ ? $self->{$name} = shift : $self->{$name}} ;
- @_ ? $self->{$name} = shift : $self->{$name} ;
+ *$AUTOLOAD = sub {$_[0]->{$name} = $_[1] if @_ > 1; return $_[0]->{$name}};
+ goto &$AUTOLOAD;
}
1;