X-Git-Url: http://www.dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXM.pm;h=435e32f94ba4fdd50b59b2ada81576f079046bcd;hb=0121434f428d8e7d1f31a9d69a4ee250b952b468;hp=e1579fabbd64d52cb25ea3cdb8b7be566460bb9c;hpb=60c0ea1747bc8ad95e531d29025f7bcee4fd10c1;p=spider.git

diff --git a/perl/DXM.pm b/perl/DXM.pm
index e1579fab..435e32f9 100644
--- a/perl/DXM.pm
+++ b/perl/DXM.pm
@@ -1,6 +1,14 @@
 #
 # DX cluster message strings for output
 #
+# Each message string will substitute $_[x] positionally. What this means is
+# that if you don't like the order in which fields in each message is output then 
+# you can change it. Also you can include various globally accessible variables
+# in the string if you want. 
+#
+# Largely because I don't particularly want to have to change all these messages
+# in every upgrade I shall attempt to add new field to the END of the list :-)
+#
 # Copyright (c) 1998 - Dirk Koopman G1TLH
 #
 # $Id$
@@ -10,19 +18,22 @@ package DXM;
 
 require Exporter;
 @ISA = qw(Exporter);
-@EXPORT = qw(m);
+@EXPORT = qw(msg);
 
 %msgs = (
-  l1 => "Sorry $a[0], you are already logged on on another channel",
-  l2 => "Hello $a[0], this is $a[1] located in $a[2]",
+  l1 => 'Sorry $_[0], you are already logged on on another channel',
+  l2 => 'Hello $_[0], this is $main::mycall located in $main::myqth',
+  pr => '$_[0] de $main::mycall $main::cldate $main::ztime >',
+  e1 => 'Invalid command',
+  e2 => 'Error: $_[0]',
 );
 
-sub m
+sub msg
 {
   my $self = shift;
-  local @a = @_;
-  my $s = $msg{$self};
+  my $s = $msgs{$self};
   return "unknown message '$self'" if !defined $s;
-  return eval $s;
+
+  return eval '"'. $s . '"';
 }