6. make set/isolate and acc/route mutually exclusive (and issue appropriate

[spider.git] / cmd / set / isolate.pl

diff --git a/cmd/set/isolate.pl b/cmd/set/isolate.pl
index 34fe22a349a63a3c2e7945fb6dc0ab44cec0f52c..89d8257b0fe5f71d3e1afa692eaaca3d7f8bed2d 100644 (file)
--- a/cmd/set/isolate.pl
+++ b/cmd/set/isolate.pl
@@ -23,13 +23,19 @@ foreach $call (@args) {
        if ($chan) {
                push @out, $self->msg('nodee1', $call);
        } else {
-               $user = DXUser->get_exact($call);
+               $user = DXUser->get($call);
                $create = !$user;
                $user = DXUser->new($call) if $create;
+               my $f;
+               push(@out, $self->msg('isoari', $call)), $f++ if Filter::getfn('route', $call, 1);
+               push(@out, $self->msg('isoaro', $call)), $f++ if Filter::getfn('route', $call, 0);
                if ($user) {
-                       $user->isolate(1);
-                       $user->close();
-                       push @out, $self->msg($create ? 'isoc' : 'iso', $call);
+                       unless ($f) {
+                               $user->isolate(1);
+                               $user->close();
+                               push @out, $self->msg($create ? 'isoc' : 'iso', $call);
+                               Log('DXCommand', $self->msg($create ? 'isoc' : 'iso', $call));
+                       }
                } else {
                        push @out, $self->msg('e3', "Set/Isolate", $call);
                }