projects
/
spider.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix initial set of bugs pointed on mailing list
[spider.git]
/
perl
/
DXCommandmode.pm
diff --git
a/perl/DXCommandmode.pm
b/perl/DXCommandmode.pm
index 6fbe90482f23dcaae9b34db21c97f877c15e5618..3eb9a1c6ce7ff153bebb30db4affbc9cf59dc227 100644
(file)
--- a/
perl/DXCommandmode.pm
+++ b/
perl/DXCommandmode.pm
@@
-54,9
+54,6
@@
$cmdimportdir = "$main::root/cmd_import"; # the base directory for importing com
# this does not exist as default, you need to create it manually
#
# this does not exist as default, you need to create it manually
#
-use vars qw($VERSION $BRANCH);
-($VERSION, $BRANCH) = dxver(q$Revision$);
-
#
# obtain a new connection this is derived from dxchannel
#
#
# obtain a new connection this is derived from dxchannel
#
@@
-384,11
+381,11
@@
sub send_talks
my ($to, $via) = $ent =~ /(\S+)>(\S+)/;
$to = $ent unless $to;
my ($to, $via) = $ent =~ /(\S+)>(\S+)/;
$to = $ent unless $to;
- my $call = $via ? $via : $to;
+ my $call = $via
&& $via ne '*'
? $via : $to;
my $clref = Route::get($call);
my $dxchan = $clref->dxchan if $clref;
if ($dxchan) {
my $clref = Route::get($call);
my $dxchan = $clref->dxchan if $clref;
if ($dxchan) {
- $dxchan->talk($self->{call}, $to,
$via
, $line);
+ $dxchan->talk($self->{call}, $to,
undef
, $line);
} else {
$self->send($self->msg('disc2', $via ? $via : $to));
my @l = grep { $_ ne $ent } @{$self->{talklist}};
} else {
$self->send($self->msg('disc2', $via ? $via : $to));
my @l = grep { $_ ne $ent } @{$self->{talklist}};
@@
-830,7
+827,7
@@
sub local_send
# send a talk message here
sub talk
{
# send a talk message here
sub talk
{
- my ($self, $from, $to, $via, $line) = @_;
+ my ($self, $from, $to, $via, $line
, $onode
) = @_;
$line =~ s/\\5E/\^/g;
if ($self->{talk}) {
if ($self->{gtk}) {
$line =~ s/\\5E/\^/g;
if ($self->{talk}) {
if ($self->{gtk}) {
@@
-839,7
+836,7
@@
sub talk
$self->local_send('T', "$to de $from: $line");
}
}
$self->local_send('T', "$to de $from: $line");
}
}
- Log('talk', $to, $from,
$via?$via:$main::mycall
, $line);
+ Log('talk', $to, $from,
'<' . ($onode || '*')
, $line);
# send a 'not here' message if required
unless ($self->{here} && $from ne $to) {
my $key = "$to$from";
# send a 'not here' message if required
unless ($self->{here} && $from ne $to) {
my $key = "$to$from";
@@
-923,9
+920,9
@@
sub format_dx_spot
my $t = ztime($_[2]);
my $loc = '';
my $clth = $self->{consort} eq 'local' ? 29 : 30;
my $t = ztime($_[2]);
my $loc = '';
my $clth = $self->{consort} eq 'local' ? 29 : 30;
- my $comment = substr
$_[3], 0, $clth;
+ my $comment = substr
(($_[3] || ''), 0, $clth);
$comment .= ' ' x ($clth - length($comment));
$comment .= ' ' x ($clth - length($comment));
- if ($self->{user}->wantgrid) {
+ if ($self->{user}->wantgrid) {
my $ref = DXUser->get_current($_[4]);
if ($ref) {
$loc = $ref->qra || '';
my $ref = DXUser->get_current($_[4]);
if ($ref) {
$loc = $ref->qra || '';
@@
-1174,5
+1171,12
@@
sub import_cmd
}
}
}
}
}
}
+
+sub print_find_reply
+{
+ my ($self, $node, $target, $flag, $ms) = @_;
+ my $sort = $flag == 2 ? "External" : "Local";
+ $self->send("$sort $target found at $node in $ms ms" );
+}
1;
__END__
1;
__END__