From: minima <minima>
Date: Mon, 26 Jul 2004 15:10:19 +0000 (+0000)
Subject: added show/425 command
X-Git-Tag: R_1_51B~28
X-Git-Url: http://dxcluster.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=65a4b5776154155cb012fe7968558d0449d74ef3;p=spider.git

added show/425 command
added variables into Internet.pm for 'external' connections
---

diff --git a/Changes b/Changes
index 4792fdc0..3ac0fd7a 100644
--- a/Changes
+++ b/Changes
@@ -1,3 +1,7 @@
+26Jul04=======================================================================
+1. added extra variables to Internet.pm to allow the various internet query
+commands to alter the url that they use. 
+2. Added show/425 command from Leo, IZ5FSA.
 05Jul04=======================================================================
 1. fix rspfcheck on pc27
 23Jun04=======================================================================
diff --git a/cmd/show/425.pl b/cmd/show/425.pl
new file mode 100644
index 00000000..9fb8d968
--- /dev/null
+++ b/cmd/show/425.pl
@@ -0,0 +1,49 @@
+#
+# Query the 425 Database server for a callsign
+#
+# from an idea by Leonardo Lastrucci IZ5FSA and information from Mauro I1JQJ
+#
+# $Id$
+#
+my ($self, $line) = @_;
+my @list = map {uc} split /\s+/, $line;		      # generate a list of callsigns
+my $l;
+my $call = $self->call;
+my @out;
+
+return (1, $self->msg('e24')) unless $Internet::allow;
+return (1, "SHOW/425 <callsign>, e.g. SH/425 3B9FR") unless @list;
+my $target = $Internet::http_proxy || $Internet::dx425_url || "www.ariscandicci.it";
+my $port = $Internet::http_proxy_port || 80;
+my $url = '';
+$url = 'http://' . ($Internet::dx425_url || 'www.ariscandicci.it'); #  if $Internet::http_proxy; 
+
+use Net::Telnet;
+
+my $t = new Net::Telnet;
+
+foreach $l (@list) {
+	eval {
+		$t->open(Host     =>  $target,
+				 Port     =>  $port,
+				 Timeout  =>  15);
+	};
+	if (!$t || $@) {
+		push @out, $self->msg('e18', 'Open(425.org)');
+	} else {
+		my $s = "GET $url/modules.php?name=425dxn&op=spider&query=$l";
+		dbg($s) if isdbg('425');
+		$t->print($s);
+		Log('call', "$call: show/425 \U$l");
+		my $state = "blank";
+		while (my $result = eval { $t->getline(Timeout => 30) } || $@) {
+			dbg($result) if isdbg('425') && $result;
+				chomp $result;
+				push @out, $result;
+		}
+		$t->close;
+		push @out, $self->msg('e3', 'Search(425.org)', uc $l) unless @out;
+	}
+}
+
+return (1, @out);
diff --git a/cmd/show/db0sdx.pl b/cmd/show/db0sdx.pl
index c90ecf97..4fab75b2 100644
--- a/cmd/show/db0sdx.pl
+++ b/cmd/show/db0sdx.pl
@@ -13,7 +13,7 @@ my @out;
 $line = uc $line;
 return (1, $self->msg('e24')) unless $Internet::allow;
 return (1, "SHOW/DB0SDX <callsign>, e.g. SH/DB0SDX ea7wa") unless $line && is_callsign($line);
-my $target = 'dotnet.grossmann.com';
+my $target = $Internet::db0sdx_url || 'dotnet.grossmann.com';
 my $port = 80;
 my $cmdprompt = '/query->.*$/';
 
diff --git a/cmd/show/qrz.pl b/cmd/show/qrz.pl
index 7122992f..ca1935a4 100644
--- a/cmd/show/qrz.pl
+++ b/cmd/show/qrz.pl
@@ -15,10 +15,15 @@ my @out;
 
 return (1, $self->msg('e24')) unless $Internet::allow;
 return (1, "SHOW/QRZ <callsign>, e.g. SH/QRZ g1tlh") unless @list;
-my $target = $Internet::http_proxy || 'www.qrz.com';
+#my $target = $Internet::http_proxy || 'www.qrz.com';
+#my $port = $Internet::http_proxy_port || 80;
+#my $url = '';
+#$url = 'http://www.qrz.com' if $Internet::http_proxy; 
+my $target = $Internet::http_proxy || $Internet::qrz_url || 'www.qrz.com';
 my $port = $Internet::http_proxy_port || 80;
 my $url = '';
-$url = 'http://www.qrz.com' if $Internet::http_proxy; 
+$url = 'http://' . ($Internet::qrz_url || '$www.qrz.com') if $Internet::http_proxy;
+
 
 use Net::Telnet;
 
diff --git a/cmd/show/wm7d.pl b/cmd/show/wm7d.pl
index 8e48a20d..097a6295 100644
--- a/cmd/show/wm7d.pl
+++ b/cmd/show/wm7d.pl
@@ -16,7 +16,7 @@ my @out;
 # send 'e24' if allow in Internet.pm is not set to 1
 return (1, $self->msg('e24')) unless $Internet::allow;
 return (1, "SHOW/WM7D <callsign>, e.g. SH/WM7D k1xx") unless $line;
-my $target = 'www.wm7d.net';
+my $target = $Internet::wm7d_url || 'www.wm7d.net';
 my $port = 5000;
 my $cmdprompt = '/query->.*$/';
 
diff --git a/perl/Internet.pm b/perl/Internet.pm
index b6a387ee..98ae0361 100644
--- a/perl/Internet.pm
+++ b/perl/Internet.pm
@@ -29,6 +29,7 @@ $allow = 0;
 # $qrz_uid = 'gb7xxx';
 #
 
+
 $qrz_uid = undef;
 
 #
@@ -58,6 +59,15 @@ $http_proxy = undef;
 
 $http_proxy_port = undef;
 
+#
+# list of urls that are used in commands, here so that they
+# can be changed if necessary.
+#
+
+$qrz_url = 'www.qrz.com';     # used by show/qrz
+$wm7d_url = 'www.wm7d.net';   # used by show/wm7d
+$db0sdx_url = 'dotnet.grossmann.com';   # used by show/db0sdx
+$dx425_url = 'www.ariscandicci.it';		# used by show/425
 
 #
 # end