[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-edu-devel
Subject:    [kde-edu-devel] Fwd: More on kvoctrain/langen2kvtml patch
From:       Kevin Krammer <kevin.krammer () gmx ! at>
Date:       2002-11-22 8:22:25
[Download RAW message or body]



----------  Forwarded Message  ----------

Subject: More on kvoctrain/langen2kvtml patch
Date: Fri, 22 Nov 2002 10:59:26 +1100
From: Ben Burton <bab@debian.org>
To: kde-devel@kde.org
Cc: kvoctrain@ewald-arnold.de

Hi.. just an extension to the patch I mailed out earlier; this also fixes
 the usage string (to include the undocumented --proxy and to fix a
 couple of typos) and adds a changelog entry for the patch.

Ben.

--- kdeedu/kvoctrain/langen2kvtml	2001/12/22 09:06:05	1.2
+++ kdeedu/kvoctrain/langen2kvtml	2002/11/21 23:53:47
@@ -57,6 +57,12 @@
 #	corrections:
 #		instead of "en" was "it" used for English articles
 #
+# Updated 22/11/02 - Ben Burton
+#	corrections:
+#		default proxy is now no proxy, not http://proxy:8080/
+#		proxy option is now --proxy=http://..., not --proxy="-p http://..."
+#		updated usage string
+#
 ####################################################################
 chomp($cwd = `pwd`);
 #
@@ -71,7 +77,7 @@ $outdir 	= $cwd;		 		# Where the output
 $langdefault	= "en";		# My favorite is English
 $trans		= "de";		# My favorite is Deutsch
 $longlesson	= 0;		# as you like
-$proxy		= "-p http://proxy:8080/";
+$proxy		= "";

 #######################################################################
 # No User configurable parameters below here
@@ -137,11 +143,17 @@ if ( ! &GetOptions(
 		"outdir=s" => \$outdir,
 		"country=s" => \$country,
 		"longlesson" => \$longlesson) ) {
-   print "Usage:\tlangen2kvtml [--lang=xx] [--trans=xx]
 [--autor=<name>]\n"; -   print "\t\t [--longsession] [--outdir=<dir>] {
 --country=x | vocfile }\n"; +   print "Usage:\tlangen2kvtml [--lang=xx]
 [--trans=xx] [--author=<name>]\n"; +   print "\t\t [--longlesson]
 [--outdir=<dir>] [--proxy=<proxy>]\n"; +   print "\t\t { --country=x |
 vocfile }\n";
    exit 1;
 }

+# Fix the proxy option if it has been given
+if ($proxy) {
+    $proxy = "-p $proxy";
+}
+
 # Get input file name if it has been given
 if ($ARGV[0] eq '' &&  $country eq "") {
     print STDERR "Error: no input filename.\n";
@@ -159,7 +171,9 @@ $tmp1=$#ARGV+1;

 if ( $country ne "" ) {
     &printflush(STDOUT,"... fetching
http://www.vokabeln.de/files/Voc-$country.zip ...\n");
-    &printflush(STDOUT,"... using proxy service $proxy ...\n");
+    if ($proxy) {
+        &printflush(STDOUT,"... using proxy service $proxy ...\n");
+    }
     `lwp-request $proxy http://www.vokabeln.de/files/Voc-$country.zip

>/tmp/Voc-$country.zip`;

     # unzip -u update only!
     # unzip -o overwrite!

>> Visit http://mail.kde.org/mailman/listinfo/kde-devel#unsub to
>> unsubscribe <<

-------------------------------------------------------

-- 
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Kevin Krammer <kevin.krammer@gmx.at>
Developer at the Kmud Project http://www.kmud.de/
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
_______________________________________________
kde-edu-devel mailing list
kde-edu-devel@mail.kde.org
http://mail.kde.org/mailman/listinfo/kde-edu-devel
[prev in list] [next in list] [prev in thread] [next in thread]