X-Git-Url: http://www.dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXM.pm;h=5a3b22e3b086415804cde6ab1c317e9fae16bed8;hb=a0cf638d2ec10e9f464bb749cf1b70fd105baf9f;hp=9be309894b8e7402c4cffa5cdf43f1f9eb2ff22f;hpb=6b6a8002929017b6d4217f68fa492a2d728ee1fe;p=spider.git

diff --git a/perl/DXM.pm b/perl/DXM.pm
index 9be30989..5a3b22e3 100644
--- a/perl/DXM.pm
+++ b/perl/DXM.pm
@@ -16,26 +16,40 @@
 
 package DXM;
 
-require Exporter;
-@ISA = qw(Exporter);
-@EXPORT = qw(msg);
+use DXVars;
+use Carp;
 
-%msgs = (
-  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]',
-  conother => 'Sorry $_[0] you are connected on another port',
-  concluster => 'Sorry $_[0] you are already connected elsewhere on the cluster',
-);
+my $localfn = "$main::root/local/Messages";
+my $fn = "$main::root/perl/Messages";
 
 sub msg
 {
-  my $self = shift;
-  my $s = $msgs{$self};
-  return "unknown message '$self'" if !defined $s;
+	my $lang = shift;
+	my $m = shift;
+	my $ref = $msgs{$lang};
+	my $s = $ref->{$m} if $ref;
+	return "unknown message '$m' in lang '$lang'" if !defined $s;
+	my $ans = eval qq{ "$s" };
+	confess $@ if $@;
+	return $ans;
+}
 
-  return eval '"'. $s . '"';
+sub load
+{
+	my $ref = shift;
+	if (-e $localfn) {
+		do $localfn;
+		return ($@) if $@ && ref $ref;
+		confess $@ if $@;
+		return ();
+	}
+	do $fn;
+	return ($@) if $@ && ref $ref;
+	confess $@ if $@;
+	return ();
+}
+
+sub init
+{
+	load();
 }
-