Prepare for git repository

[spider.git] / perl / Route / Node.pm

diff --git a/perl/Route/Node.pm b/perl/Route/Node.pm
index 1fbd8f71a291a1cddab0b6c71430bea16c1610cb..f80e58e324ce5c8e19050d6b03537602fee12777 100644 (file)
--- a/perl/Route/Node.pm
+++ b/perl/Route/Node.pm
@@ -14,12 +14,6 @@ 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;
-
 use vars qw(%list %valid @ISA $max $filterdef);
 @ISA = qw(Route);
 
@@ -29,8 +23,9 @@ 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',
+                 handle_xml => '0,Using XML,yesno',
+                 lastmsg => '0,Last Route Msg,atime',
+                 lastid => '0,Last Route MsgID',
 );
 
 $filterdef = $Route::filterdef;
@@ -110,6 +105,21 @@ sub del
        return @nodes;
 }
 
+# this deletes this node completely by grabbing the parents
+# and deleting me from them
+sub delete
+{
+       my $self = shift;
+       my @out;
+       
+       $self->_del_users;
+       foreach my $call (@{$self->{parent}}) {
+               my $parent = Route::Node::get($call);
+               push @out, $parent->del($self) if $parent;
+       }
+       return @out;
+}
+
 sub del_nodes
 {
        my $parent = shift;
@@ -224,7 +234,6 @@ sub new
        $self->{flags} = shift;
        $self->{users} = [];
        $self->{nodes} = [];
-       $self->{lid} = 0;
        
        $list{$call} = $self;
        
@@ -245,22 +254,6 @@ 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 > 60000) {
-               $self->{id} = $id;
-               return 1;
-       }
-       return 0;
-}
-
 sub _addparent
 {
        my $self = shift;
@@ -315,19 +308,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;