X-Git-Url: https://git.deb.at/?p=deb%2Fpackages.git;a=blobdiff_plain;f=lib%2FPackages%2FDoIndex.pm;h=5aba6b3b0dc69588320b50a6e0210db114cede79;hp=416f3db56db8fc3ec8b1c81180554f69a5e3b0e1;hb=0c1a44893f94f98deac8435e6ab235228880087f;hpb=376bc6654631bc29e9532c4f99348b75bed23753

diff --git a/lib/Packages/DoIndex.pm b/lib/Packages/DoIndex.pm
index 416f3db..5aba6b3 100644
--- a/lib/Packages/DoIndex.pm
+++ b/lib/Packages/DoIndex.pm
@@ -4,11 +4,11 @@ use strict;
 use warnings;
 
 use CGI qw( :cgi );
+use POSIX qw( strftime );
 use Exporter;
 
 use Deb::Versions;
 use Packages::Config qw( $TOPDIR );
-use Packages::I18N::Locale;
 use Packages::CGI;
 
 our @ISA = qw( Exporter );
@@ -26,17 +26,23 @@ my %encoding = (
 		);
 sub send_file {
     my ($file, $params, $opts) = @_;
+    my $cat = $opts->{cat};
 
     if ($params->{errors}{suite}) {
-	fatal_error( _g( "suite not valid or not specified" ) );
+	fatal_error( $cat->g( "suite not valid or not specified" ) );
     }
     if (@{$opts->{suite}} > 1) {
-	fatal_error( sprintf( _g( "more than one suite specified for show_static (%s)" ), "@{$opts->{suite}}" ) );
+	fatal_error( $cat->g( "more than one suite specified for show_static (%s)",
+			      "@{$opts->{suite}}" ) );
     }
     if (@{$opts->{subsection}} > 1) {
-	fatal_error( sprintf( _g( "more than one subsection specified for show_static (%s)" ), "@{$opts->{suite}}" ) );
+	fatal_error( $cat->g( "more than one subsection specified for show_static (%s)",
+			      "@{$opts->{suite}}" ) );
     }
 
+    if ($opts->{format} eq 'txt.gz') {
+	$opts->{po_lang} = 'en';
+    }
     my $wwwdir = "$TOPDIR/www";
     my $path = "";
     $path .= "source/" if $opts->{source};
@@ -44,23 +50,20 @@ sub send_file {
     $path .= "$opts->{archive}[0]/" if @{$opts->{archive}} == 1;
     $path .= "$opts->{subsection}[0]/" if @{$opts->{subsection}};
     $path .= "$opts->{priority}[0]/" if @{$opts->{priority}};
-
-    #FIXME: ugly hack
-    if ($opts->{lang} ne 'en' and !-f "$wwwdir/$path$file.$opts->{lang}.$opts->{format}") {
-	$opts->{lang} = 'en';
-    }
-    $path .= "$file.$opts->{lang}.$opts->{format}";
+    $path .= "$file.$opts->{po_lang}.$opts->{format}";
 
     unless (@Packages::CGI::fatal_errors) {
 	my $buffer;
 	if (open( INDEX, '<', "$wwwdir/$path" )) {
 	    my %headers;
-	    $headers{'-charset'} = get_charset( $opts->{lang} );
+	    $headers{'-charset'} = 'UTF-8';
 	    $headers{'-type'} = get_mime( $opts->{format}, 'text/plain' );
 	    $headers{'-content-encoding'} = $encoding{$opts->{format}} if exists $encoding{$opts->{format}};
 	    my ($size,$mtime) = (stat("$wwwdir/$path"))[7,9];
 	    $headers{'-content-length'} = $size;
-	    $headers{'-last-modified'} = gmtime($mtime);
+	    $headers{'-vary'} = 'negotiate,accept-language';
+	    $headers{'-last-modified'} = strftime("%a, %d %b %Y %T %z", localtime($mtime));
+	    $headers{'-expires'} = strftime("%a, %d %b %Y %T %z", localtime($mtime+(12*3600)));
 	    print header( %headers );
 
 	    binmode INDEX;
@@ -70,7 +73,7 @@ sub send_file {
 	    close INDEX;
 	    exit;
 	} else {
-	    fatal_error( sprintf( _g( "couldn't read index file %s: %s" ),
+	    fatal_error( $cat->g( "couldn't read index file %s: %s",
 				  $path, $! ) );
 	}
     }