X-Git-Url: https://git.deb.at/?a=blobdiff_plain;f=lib%2FPackages%2FDoIndex.pm;h=a0cae2baf2f435cff7fa59f1f698d1d2ee19894c;hb=a98a6736b94a98c3a693b7f087b846e7eb698783;hp=0ed874a24ce31a4dcf5865a3036c0cd25330fe58;hpb=2ec757bb58907b15c43548be5601d4f2b8c7caac;p=deb%2Fpackages.git

diff --git a/lib/Packages/DoIndex.pm b/lib/Packages/DoIndex.pm
index 0ed874a..a0cae2b 100644
--- a/lib/Packages/DoIndex.pm
+++ b/lib/Packages/DoIndex.pm
@@ -8,7 +8,6 @@ use Exporter;
 
 use Deb::Versions;
 use Packages::Config qw( $TOPDIR );
-use Packages::I18N::Locale;
 use Packages::CGI;
 
 our @ISA = qw( Exporter );
@@ -21,26 +20,23 @@ sub do_allpackages {
     return send_file( 'allpackages', @_ );
 }
 
-# no real need for more flexibility here, I think...
-my %mime_types = (
-		  txt => 'text/plain',
-		  'txt.gz' => 'text/plain',
-		  html => 'text/html',
-		  );
 my %encoding = (
 		'txt.gz' => 'x-gzip',
 		);
 sub send_file {
-    my ($file, $params, $opts, $html_header) = @_;
+    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 suite specified for show_static (%s)" ), "@{$opts->{suite}}" ) );
+	fatal_error( $cat->g( "more than one subsection specified for show_static (%s)",
+			      "@{$opts->{suite}}" ) );
     }
 
     my $wwwdir = "$TOPDIR/www";
@@ -50,17 +46,23 @@ 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}};
-    # we don't have translated index pages for subsections yet
-    $opts->{lang} = 'en' if @{$opts->{subsection}} or $file eq 'allpackages';
+
+    #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}";
 
     unless (@Packages::CGI::fatal_errors) {
 	my $buffer;
 	if (open( INDEX, '<', "$wwwdir/$path" )) {
 	    my %headers;
-	    $headers{'-charset'} = get_charset( $opts->{lang} );
-	    $headers{'-type'} = $mime_types{$opts->{format}} || 'text/plain';
+	    $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);
 	    print header( %headers );
 
 	    binmode INDEX;
@@ -70,7 +72,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, $! ) );
 	}
     }