From: minima <minima>
Date: Fri, 10 Dec 2004 13:18:53 +0000 (+0000)
Subject: include fix for new DB0SDX from David, N9KT
X-Git-Tag: R_1_52~256
X-Git-Url: http://www.dxcluster.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=4c8be388424d403a33d72798b02e49c4f1bfd0ef;p=spider.git

include fix for new DB0SDX from David, N9KT
remove redundant removals of old style spot stat files
---

diff --git a/Changes b/Changes
index 66f31cd4..b8bee59a 100644
--- a/Changes
+++ b/Changes
@@ -1,3 +1,6 @@
+10Dec04=======================================================================
+1. Included fixes sent in by David, N9KT for the new DB0SDX site.
+2. removed redundant "rm *bys" and "rm *cys" from Spot::init().
 09Dec04=======================================================================
 1. fix show/mydx properly this time (and test the fix!)
 2. fix the default in show/qrz
diff --git a/cmd/show/db0sdx.pl b/cmd/show/db0sdx.pl
index 4fab75b2..7e949683 100644
--- a/cmd/show/db0sdx.pl
+++ b/cmd/show/db0sdx.pl
@@ -2,6 +2,8 @@
 # Query the DB0SDX QSL server for a callsign
 #
 # Copyright (c) 2003 Dirk Koopman G1TLH
+# Modified Dec 9, 2004 for new website and xml schema by David Spoelstra N9KT
+# and tidied up by me (Dirk)
 #
 # $Id$
 #
@@ -13,7 +15,9 @@ 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 = $Internet::db0sdx_url || 'dotnet.grossmann.com';
+my $target = $Internet::db0sdx_url || 'www.qslinfo.de';
+my $path = $Internet::db0sdx_path || '/qslinfo';
+my $suffix = $Internet::db0sdx_suffix || '.asmx';
 my $port = 80;
 my $cmdprompt = '/query->.*$/';
 
@@ -35,8 +39,9 @@ if (!$info) {
 	my $s = qq(<?xml version="1.0" encoding="utf-8"?>
 <soap:Envelope xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:soap="http://schemas.xmlsoap.org/soap/envelope/">
   <soap:Body>
-    <qslinfo xmlns="http://dotnet.grossmann.com/qslinfo">
+    <qslinfo xmlns="http://$target$path">
       <callsign>$line</callsign>
+      <ClientInformation>DXSpider V$main::version B$main::build ($call\@$main::mycall)</ClientInformation>
     </qslinfo>
   </soap:Body>
 </soap:Envelope>
@@ -47,12 +52,12 @@ if (!$info) {
 	
 	dbg("db0sdx out: $s") if isdbg('db0sdx');
 	
-	$t->print("POST /qslinfo/qslinfo.asmx HTTP/1.0");
-	$t->print("Host: dotnet.grossmann.com");
+	$t->print("POST $path$suffix HTTP/1.0");
+	$t->print("Host: $target");
 	$t->print("Content-Type: text/xml; charset=utf-8");
 	$t->print("Content-Length: $lth");
 	$t->print("Connection: Close");
-	$t->print("SOAPAction: \"http://dotnet.grossmann.com/qslinfo/qslinfo\"");
+	$t->print(qq{SOAPAction: "http://$target$path"});
 	$t->print("");
 	$t->put($s);
 
diff --git a/perl/Internet.pm b/perl/Internet.pm
index 5634945f..9f446b74 100644
--- a/perl/Internet.pm
+++ b/perl/Internet.pm
@@ -60,13 +60,15 @@ $http_proxy = undef;
 $http_proxy_port = undef;
 
 #
-# list of urls that are used in commands, here so that they
+# list of urls and other things 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
+$db0sdx_url = 'www.qslinfo.de'; # used by show/db0sdx
+$db0sdx_path = '/qslinfo';
+$db0sdx_suffix = '.asmx';
 $dx425_url = 'www.ariscandicci.it';		# used by show/425
 $contest_host = 'www.sk3bg.se';         # used by show/contest
 $contest_url = "http://$contest_host/contest/text";         # used by show/contest
diff --git a/perl/Spot.pm b/perl/Spot.pm
index 6c5c9162..462cb673 100644
--- a/perl/Spot.pm
+++ b/perl/Spot.pm
@@ -102,9 +102,6 @@ sub init
 	mkdir "$dirprefix", 0777 if !-e "$dirprefix";
 	$fp = DXLog::new($dirprefix, "dat", 'd');
 	$statp = DXLog::new($dirprefix, "dys", 'd');
-	my $rm = $main::is_win ? 'del' : 'rm -f';
-	system("$rm $main::data/$dirprefix/*/*.bys");
-	system("$rm $main::data/$dirprefix/*/*.cys");
 }
 
 sub prefix