X-Git-Url: http://gb7djk.dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FRoute%2FNode.pm;h=5858ddcc0053184f77b2eb7481441a3906c3c660;hb=ff0316b070de2d3a7cecd638e87fba47fa7aeaf5;hp=08b74c737295b15006a959e431a0eaa34b19fd42;hpb=3634fba90a64fe488d237f438d9945d81158da52;p=spider.git

diff --git a/perl/Route/Node.pm b/perl/Route/Node.pm
index 08b74c73..5858ddcc 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;
-$main::build += $VERSION;
-$main::branch += $BRANCH;
+
+main::mkver($VERSION = q$Revision$);
 
 use vars qw(%list %valid @ISA $max $filterdef);
 @ISA = qw(Route);
@@ -29,6 +27,8 @@ use vars qw(%list %valid @ISA $max $filterdef);
 		  users => '0,Users,parray',
 		  usercount => '0,User Count',
 		  version => '0,Version',
+		  np => '0,Using New Prot,yesno',
+		  lid => '0,Last Msgid',
 );
 
 $filterdef = $Route::filterdef;
@@ -90,12 +90,12 @@ sub del
 
 	# delete parent from this call's parent list
 	$pref->_delnode($self);
-	my @ref = $self->_delparent($pref);
+    $self->_delparent($pref);
 	my @nodes;
 	my $ncall = $self->{call};
 	
 	# is this the last connection, I have no parents anymore?
-	unless (@ref) {
+	unless (@{$self->{parent}}) {
 		foreach my $rcall (@{$self->{nodes}}) {
 			next if grep $rcall eq $_, @_;
 			my $r = Route::Node::get($rcall);
@@ -189,6 +189,12 @@ sub nodes
 	return @{$self->{nodes}};
 }
 
+sub parents
+{
+	my $self = shift;
+	return @{$self->{parent}};
+}
+
 sub rnodes
 {
 	my $self = shift;
@@ -216,6 +222,7 @@ sub new
 	$self->{flags} = shift;
 	$self->{users} = [];
 	$self->{nodes} = [];
+	$self->{lid} = 0;
 	
 	$list{$call} = $self;
 	
@@ -236,6 +243,22 @@ sub get_all
 	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;
@@ -290,19 +313,16 @@ sub DESTROY
 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;