projects
/
spider.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
put in temp fix for pc10 talk crashes
[spider.git]
/
perl
/
DXChannel.pm
diff --git
a/perl/DXChannel.pm
b/perl/DXChannel.pm
index 9812037fce2ee1fa44255555fe6e63c09957c0d3..7048257188392544b42ca287eed2001e5b1c5162 100644
(file)
--- a/
perl/DXChannel.pm
+++ b/
perl/DXChannel.pm
@@
-21,7
+21,7
@@
#
# Copyright (c) 1998-2000 - Dirk Koopman G1TLH
#
#
# Copyright (c) 1998-2000 - Dirk Koopman G1TLH
#
-#
$Id$
+#
#
package DXChannel;
#
package DXChannel;
@@
-101,6
+101,7
@@
$count = 0;
itu => '0,ITU Zone',
cq => '0,CQ Zone',
enhanced => '5,Enhanced Client,yesno',
itu => '0,ITU Zone',
cq => '0,CQ Zone',
enhanced => '5,Enhanced Client,yesno',
+ gtk => '5,Using GTK,yesno',
senddbg => '8,Sending Debug,yesno',
width => '0,Column Width',
disconnecting => '9,Disconnecting,yesno',
senddbg => '8,Sending Debug,yesno',
width => '0,Column Width',
disconnecting => '9,Disconnecting,yesno',
@@
-118,15
+119,11
@@
$count = 0;
lastmsgpoll => '0,Last Msg Poll,atime',
inscript => '9,In a script,yesno',
handle_xml => '9,Handles XML,yesno',
lastmsgpoll => '0,Last Msg Poll,atime',
inscript => '9,In a script,yesno',
handle_xml => '9,Handles XML,yesno',
+ do_pc9x => '9,Handles PC9x,yesno',
inqueue => '9,Input Queue,parray',
inqueue => '9,Input Queue,parray',
+ next_pc92_update => '9,Next PC92 Update,atime',
);
);
-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;
-
# object destruction
sub DESTROY
{
# object destruction
sub DESTROY
{
@@
-358,7
+355,8
@@
sub send_now
my @lines = split /\n/;
for (@lines) {
$conn->send_now("$sort$call|$_");
my @lines = split /\n/;
for (@lines) {
$conn->send_now("$sort$call|$_");
- dbg("-> $sort $call $_") if isdbg('chan');
+ # debug log it, but not if it is a log message
+ dbg("-> $sort $call $_") if $sort ne 'L' && isdbg('chan');
}
}
$self->{t} = time;
}
}
$self->{t} = time;
@@
-381,7
+379,8
@@
sub send_later
my @lines = split /\n/;
for (@lines) {
$conn->send_later("$sort$call|$_");
my @lines = split /\n/;
for (@lines) {
$conn->send_later("$sort$call|$_");
- dbg("-> $sort $call $_") if isdbg('chan');
+ # debug log it, but not if it is a log message
+ dbg("-> $sort $call $_") if $sort ne 'L' && isdbg('chan');
}
}
$self->{t} = time;
}
}
$self->{t} = time;
@@
-469,7
+468,7
@@
sub disconnect
my $user = $self->{user};
$user->close() if defined $user;
my $user = $self->{user};
$user->close() if defined $user;
- $self->{conn}->disconnect;
+ $self->{conn}->disconnect
if $self->{conn}
;
$self->del();
}
$self->del();
}
@@
-513,9
+512,11
@@
sub tell_login
#
sub tell_buddies
{
#
sub tell_buddies
{
- my ($self, $m, $call) = @_;
+ my ($self, $m, $call
, $node
) = @_;
$call ||= $self->{call};
$call ||= $self->{call};
+ $call =~ s/-\d+$//;
+ $m .= 'n' if $node;
# send info to all logged in thingies
my @dxchan = get_all_users();
# send info to all logged in thingies
my @dxchan = get_all_users();
@@
-523,7
+524,7
@@
sub tell_buddies
foreach $dxchan (@dxchan) {
next if $dxchan == $self;
next if $dxchan->{call} eq $main::mycall;
foreach $dxchan (@dxchan) {
next if $dxchan == $self;
next if $dxchan->{call} eq $main::mycall;
- $dxchan->send($dxchan->msg($m, $call
)) if grep $_ eq $call, @{$dxchan->user->buddies
} ;
+ $dxchan->send($dxchan->msg($m, $call
, $node)) if grep $_ eq $call, @{$dxchan->{user}->{buddies}
} ;
}
}
}
}
@@
-722,6
+723,19
@@
sub process
}
}
}
}
+sub handle_xml
+{
+ my $self = shift;
+ my $r = 0;
+
+ if (DXXml::available()) {
+ $r = $self->{handle_xml} || 0;
+ } else {
+ delete $self->{handle_xml} if exists $self->{handle_xml};
+ }
+ return $r;
+}
+
#no strict;
sub AUTOLOAD
{
#no strict;
sub AUTOLOAD
{