clean up various things and add the DXXml.pm module

[spider.git] / perl / AMsg.pm

diff --git a/perl/AMsg.pm b/perl/AMsg.pm
index 0b94c15d4bfc48a2d810b030919255dc6b208b56..4738403a5bf2d2b1f6aee333ac8709ce3c1208c5 100644 (file)
--- a/perl/AMsg.pm
+++ b/perl/AMsg.pm
@@ -22,10 +22,8 @@ use Thingy;
 use Thingy::Hello;
 
 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;
+
+main::mkver($VERSION = q$Revision$);
 
 use vars qw(@ISA $deftimeout);
 
@@ -128,7 +126,6 @@ sub new_client {
                        $conn->{outbound} = 0;
                        $conn->{state} = 'WH';          # wait for return authorize
                        my $thing = $conn->{lastthing} = Thingy::Hello->new();
-
                        $thing->send($conn, 'Aranea');
                        dbg("-> D $conn->{peerhost} $thing->{Aranea}") if isdbg('chan');
                }
@@ -172,7 +169,7 @@ sub new_channel
        # set up the basic channel info
        # is there one already connected to me - locally? 
        my $user = DXUser->get_current($call);
-       my $dxchan = DXChannel->get($call);
+       my $dxchan = DXChannel::get($call);
        if ($dxchan) {
                if ($main::bumpexisting && $call ne $main::mycall) {
                        my $ip = $conn->{peerhost} || 'unknown';