X-Git-Url: http://dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FRoute%2FNode.pm;h=d46733bbcdf295e05aafd649e34262e688fd904a;hb=4f2b8661933ee3e3ccda2596d30485d98dd18ecb;hp=0c2b2e4a6f69c7d20449fc1005250a66f2869bda;hpb=7b616aeabce92e3cb416a5fe6640a288adfe5410;p=spider.git

diff --git a/perl/Route/Node.pm b/perl/Route/Node.pm
index 0c2b2e4a..d46733bb 100644
--- a/perl/Route/Node.pm
+++ b/perl/Route/Node.pm
@@ -15,10 +15,8 @@ use Route::User;
 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,0));
-$main::build += $VERSION;
-$main::branch += $BRANCH;
+
+main::mkver($VERSION = q$Revision$);
 
 use vars qw(%list %valid @ISA $max $filterdef);
 @ISA = qw(Route);
@@ -29,8 +27,9 @@ use vars qw(%list %valid @ISA $max $filterdef);
 		  users => '0,Users,parray',
 		  usercount => '0,User Count',
 		  version => '0,Version',
+		  build => '0,Build',
+		  sw => '0,Software',
 		  np => '0,Using New Prot,yesno',
-		  lid => '0,Last Msgid',
 );
 
 $filterdef = $Route::filterdef;
@@ -142,10 +141,10 @@ sub add_user
 	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}};
@@ -210,6 +209,39 @@ sub rnodes
 	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
 {
@@ -220,8 +252,8 @@ 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;
@@ -254,7 +286,7 @@ sub newid
 	if ($id > $self->{lid}) {
 		$self->{lid} = $id;
 		return 1;
-	} elsif ($self->{lid} - $id > 60000) {
+	} elsif ($self->{lid} - $id > 500) {
 		$self->{id} = $id;
 		return 1;
 	}