basic raw PC base NP added

[spider.git] / perl / DXCommandmode.pm

diff --git a/perl/DXCommandmode.pm b/perl/DXCommandmode.pm
index cda7690415ce9f56539c009894eea3ca4c421268..a72b0232aed11b5235547200014e7ed946202244 100644 (file)
--- a/perl/DXCommandmode.pm
+++ b/perl/DXCommandmode.pm
@@ -47,7 +47,7 @@ $maxbadcount = 3;                             # no of bad words allowed before disconnection
 
 use vars qw($VERSION $BRANCH);
 $VERSION = sprintf( "%d.%03d", q$Revision$ =~ /(\d+)\.(\d+)/ );
-$BRANCH = sprintf( "%d.%03d", q$Revision$ =~ /\d+\.\d+\.(\d+)\.(\d+)/ ) || 0;
+$BRANCH = sprintf( "%d.%03d", q$Revision$ =~ /\d+\.\d+\.(\d+)\.(\d+)/  || (0,0));
 $main::build += $VERSION;
 $main::branch += $BRANCH;
 
@@ -470,7 +470,7 @@ sub run_cmd
                        return ();
                }
        }
-       return (@ans);
+       return map {s/([^\s])\s+$/$1/; $_} @ans;
 }
 
 #
@@ -646,7 +646,7 @@ sub clear_cmd_cache
        no strict 'refs';
        
        for (keys %Cache) {
-               undef *{$_};
+               undef *{$_} unless /cmd_cache/;
                dbg("Undefining cmd $_") if isdbg('command');
        }
        %cmd_cache = ();
@@ -770,6 +770,7 @@ sub talk
 sub announce
 {
        my $self = shift;
+       my $origin = shift;
        my $line = shift;
        my $isolate = shift;
        my $to = shift;
@@ -801,6 +802,7 @@ sub announce
 sub dx_spot
 {
        my $self = shift;
+       my $origin = shift;
        my $line = shift;
        my $isolate = shift;
        my ($filter, $hops);
@@ -827,6 +829,7 @@ sub dx_spot
 sub wwv
 {
        my $self = shift;
+       my $origin = shift;
        my $line = shift;
        my $isolate = shift;
        my ($filter, $hops);
@@ -846,6 +849,7 @@ sub wwv
 sub wcy
 {
        my $self = shift;
+       my $origin = shift;
        my $line = shift;
        my $isolate = shift;
        my ($filter, $hops);