From: minima <minima>
Date: Wed, 28 Jul 2004 14:26:07 +0000 (+0000)
Subject: fix sh/contest so that it's urls are in Internet.pm
X-Git-Tag: R_1_51B~25
X-Git-Url: http://dxcluster.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=17e88d739dbfcab7c690a071f9f5470a354f2011;p=spider.git

fix sh/contest so that it's urls are in Internet.pm
---

diff --git a/Changes b/Changes
index 91568a35..6dafb764 100644
--- a/Changes
+++ b/Changes
@@ -1,6 +1,7 @@
 28Jul04=======================================================================
 1. backported 'Investigate' from NP branch so that only pingable nodes
 are 'believed'.
+2. added missing entries in Internet.pm for sh/contest
 26Jul04=======================================================================
 1. added extra variables to Internet.pm to allow the various internet query
 commands to alter the url that they use. 
diff --git a/cmd/show/contest.pl b/cmd/show/contest.pl
index 8f83d949..cb5b0a04 100644
--- a/cmd/show/contest.pl
+++ b/cmd/show/contest.pl
@@ -9,7 +9,7 @@
 
 my ($self, $line) = @_;
 
-return (1, "usage: sh/contest  <year_and_month>, e g sh/contest 2002sep ") unless $line;
+#return (1, "usage: sh/contest  <year_and_month>, e g sh/contest 2002sep ") unless $line;
 
 my @out;
 
@@ -20,18 +20,24 @@ my $mon;;
 $line = lc $line;
 my ($m,$y) = $line =~ /^([a-z]{3})\w*\s*(\d+)/;
 ($y,$m) = $line =~ /^(\d+)\s*([a-z]{3})/ unless $y && $m;
+unless ($y && $m) {
+	($m,$y) = (gmtime)[4,5];
+	$m = qw(jan feb mar apr may jun jul aug sep oct nov dec)[$m];
+	$y += 1900;
+}
 $y += 2000 if $y <= 50;
 $y += 1900 if $y > 50 && $y <= 99;
 $m = 'oct' if $m eq 'okt';
 $m = 'may' if $m eq 'mai' || $m eq 'maj';
 $mon = "$y$m";
 
-dbg($mon);
+dbg($mon) if isdbg('contest');
 
 my $filename = "c" . $mon . ".txt";
-my $host = 'www.sk3bg.se';
+my $host = $Internet::contest_host || 'www.sk3bg.se';
 my $port = 80;
-my $url = "http://www.sk3bg.se/contest/text/$filename";
+my $url = $Internet::contest_url || "http://www.sk3bg.se/contest/text";
+$url .= "/$filename";
 
 my $t = new Net::Telnet (Telnetmode => 0);
 eval {
@@ -41,7 +47,7 @@ eval {
 if (!$t || $@) {
     push @out, $self->msg('e18','sk3bg.se');
 } else {
-    my $s = "GET http://www.sk3bg.se/contest/text/$filename";
+    my $s = "GET $url";
     $t->print($s);
     my $notfound = $t->getline(Timeout => 10);
     if ($notfound =~ /404 Object Not Found/) {