[Debian-l10n-commits] [SCM] Debian i18n - l10n development - dl10n robots branch, master, updated. 9989ba69eabd3ea55ff47ef3a6fce7ca212efe59

[Nicolas François]

The following commit has been merged in the master branch:
commit 8d84241b337484f5da4025c2c27c942f0f0ffd92
Author: Nicolas François <nicolas.francois at centraliens.net>
Date:   Sun Jun 17 16:41:10 2012 +0200

    Cleanups.
    
    * dl10n-html: Cleanup.
    * dl10n-html: Do not create html/include.
    * dl10n-html: Remove the files created in include/ after usage.

diff --git a/Changelog b/Changelog
index 9ef7ebf..0cf2852 100644
--- a/Changelog
+++ b/Changelog
@@ -1,5 +1,11 @@
 2012-06-17  Nicolas François  <nicolas.francois at centraliens.net>
 
+	* dl10n-html: Cleanup.
+	* dl10n-html: Do not create html/include.
+	* dl10n-html: Remove the files created in include/ after usage.
+
+2012-06-17  Nicolas François  <nicolas.francois at centraliens.net>
+
 	* cron/spiderinit: Activate English.
 	* cron/spiderinit: Add intermediate checkpoint for the Galician
 	and Romanian mailing lists.
diff --git a/dl10n-html b/dl10n-html
index 80c5528..9df8943 100755
--- a/dl10n-html
+++ b/dl10n-html
@@ -38,9 +38,6 @@ my $progname = $0;
 my $VERSION = "4.0";			 # External Version Number
 my $BANNER  = "Debian l10n infrastructure -- mailing list spider v$VERSION"; # Version Banner - text form
 
-my $cmdline_year  = undef;
-my $cmdline_month = undef;
-my $cmdline_msg   = undef;
 my $cmdline_file  = undef;
 
 =head1 Command line option parsing
@@ -61,20 +58,6 @@ display version and exit
 
 =back
 
-=item Begin point of the crawling:
-
-=over
-
-=item --year=YYYY
-
-=item --month=MM
-
-=item --message=msg
-
-=back
-
-if not specified, will crawl for new messages.
-
 =item Database to fill:
 
 =over
@@ -213,8 +196,8 @@ EOF
 	opendir D, './include'	or die "Cannot open .: $!";
 	my @files = readdir D;
 	closedir D;
-	mkpath ("html/include", 02775) or die "Cannot create include directory\n" unless (-d "html/include");
-	mkpath ("html/$Debian::L10n::Utils::Language{$lang}", 02775) or die "Cannot create $Debian::L10n::Utils::Language{$lang} directory\n" unless (-d "html/$Debian::L10n::Utils::Language{$lang}");
+#	mkpath ("html/include", 02775) or die "Cannot create include directory\n" unless (-d "html/include");
+	mkpath ("html/$language", 02775) or die "Cannot create $language directory\n" unless (-d "html/$language");
 
 	foreach (grep (/^$lang\./, @files)) {
 		next unless /\.inc$/;
@@ -222,12 +205,10 @@ EOF
 		open I, "<include/$_.inc"	or die "Cannot open $_.inc: $!";
 		my @inc = <I>;
 		close I;
-		open I, ">html/include/$_.inc"	or die "Cannot open $_.inc $_";
-		print I @inc;
-		close I;
-		open H, ">html/$Debian::L10n::Utils::Language{$lang}/$_.html"	or die "Cannot open $_.html: $_";
+		open H, ">html/$language/$_.html"	or die "Cannot open $_.html: $_";
 		print H $head;
 		print H @inc;
+		unlink "include/$_.inc"		or die "Cannot delete include/$_.inc: $!";
 		print H $tail;
 		close H;
 	}

-- 
Debian i18n - l10n development - dl10n robots