do it properly!

[spider.git] / perl / Thingy / Rt.pm

diff --git a/perl/Thingy/Rt.pm b/perl/Thingy/Rt.pm
index 49f2bc616cc5167781421c13bf08b811496592d0..86c26ea8d487731e740b8d70808089bf4a113c21 100644 (file)
--- a/perl/Thingy/Rt.pm
+++ b/perl/Thingy/Rt.pm
@@ -81,52 +81,68 @@ sub handle_cf
 {
        my $thing = shift;
        my $dxchan = shift;
-       my $origin = $thing->{user} || $thing->{origin};
+       my $origin = $thing->{origin};
        my $chan_call = $dxchan->{call};
        
        my $parent = Route::Node::get($origin);
        unless ($parent) {
-               dbg("Thingy::Rt::cf: received from $thing->{origin}/$origin on $chan_call unknown") if isdbg('chanerr');
+               dbg("Thingy::Rt::cf: received from $origin on $chan_call unknown") if isdbg('chanerr');
                return;
        }
+       $parent->np(1);
+       
+       my @pc19;
+       my @pc21;
+
+       # move the origin over to the user, if required
+       if ($thing->{user}) {
+               $origin = $thing->{user};
+               my $ref = Route::Node::get($origin);
+               if ($ref) {
+                       $parent = $ref;
+               } else {
+                       # auto vivify a node that has come that we don't know about
+                       push @pc19, $parent->add($origin, 0, 1);
+                       $parent = Route::Node::get($origin); # reparent to me now.
+               }
+               $parent->np(1);
+       }
 
        # do nodes
        my %in;
        if ($thing->{n}) {
                for (split(/:/, $thing->{n})) {
                        my ($here, $call) = unpack("A1 A*", $_);
-                       unless ($call eq $main::mycall) {
-                               $in{$call} = $here;
-                       }
+                       next if $call eq $main::mycall;
+                       $in{$call} = $here;
                }
        }
        if ($thing->{a}) {
                for (split(/:/, $thing->{a})) {
                        my ($here, $call) = unpack("A1 A*", $_); 
-                       unless ($call eq $main::mycall) {
-                               $in{$call} = $here;
-                       }
+                       next if $call eq $main::mycall;
+                       $in{$call} = $here;
                } 
        }
        my ($del, $add) = $parent->diff_nodes(keys %in);
-       if ($add) {
-               my @pc21;
+       if ($del) {
                foreach my $call (@$del) {
+                       next if $call eq $main::mycall;
                        RouteDB::delete($call, $chan_call);
                        my $ref = Route::Node::get($call);
                        push @pc21, $ref->del($parent) if $ref;
                }
-               $thing->{pc21n} = \@pc21 if @pc21;
        }
-       if ($del) {
-               my @pc19;
+       if ($add) {
                foreach my $call (@$add) {
+                       next if $call eq $main::mycall;
                        RouteDB::update($call, $chan_call);
                        my $here = $in{$call};
                        push @pc19, $parent->add($call, 0, $here);
                }
-               $thing->{pc19n} = \@pc19 if @pc19;
        }
+       $thing->{pc21n} = \@pc21 if @pc21;
+       $thing->{pc19n} = \@pc19 if @pc19;
        
        # now users
        if ($thing->{u}) {