X-Git-Url: http://dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=cmd%2Fshow%2Fcontest.pl;h=4b3e68ba813e0b5b3004a9dd07db520de385fd12;hb=64461bf14f8ce1a01d420a01f1cf056f13b7385b;hp=8f83d949c517072904ca92d21612cac5f895ef5c;hpb=de7634cfdcc23dfc6fd9457d27245f27ddf2e252;p=spider.git

diff --git a/cmd/show/contest.pl b/cmd/show/contest.pl
index 8f83d949..4b3e68ba 100644
--- a/cmd/show/contest.pl
+++ b/cmd/show/contest.pl
@@ -4,12 +4,12 @@
 # Tommy Johansson (SM3OSM) 2002-07-23
 # New version using Net::Telnet  2003-03-09
 #
-# $Id$
+#
 #
 
 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;
 
@@ -18,20 +18,27 @@ my $mon;;
 # trying to make the syntax abit more user friendly...
 # and yes, I have been here and it *is* all my fault (dirk)
 $line = lc $line;
-my ($m,$y) = $line =~ /^([a-z]{3})\w*\s*(\d+)/;
-($y,$m) = $line =~ /^(\d+)\s*([a-z]{3})/ unless $y && $m;
+my ($m,$y) = $line =~ /^([a-z]+)\s*(\d+)/;
+($y,$m) = $line =~ /^(\d+)\s*([a-z]+)/ unless $y && $m;
+unless ($y && $m) {
+	($m,$y) = (gmtime)[4,5];
+	$m = lc $DXUtil::month[$m];
+	$y += 1900;
+}
 $y += 2000 if $y <= 50;
 $y += 1900 if $y > 50 && $y <= 99;
+$m = substr $m, 0, 3 if length $m > 3;
 $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 +48,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/) {