X-Git-Url: https://git.deb.at/?a=blobdiff_plain;f=lib%2FPackages%2FDoIndex.pm;h=6d8d4b6dc112ee36c18188956a35f1f34a83cad8;hb=cf56c281cb5054022e986de58ca288c71f939474;hp=064a18ad2aa4b386c336dccc3d01af144ca25a0e;hpb=01393b020237bbfa4571d41cc98899b4d25acd8b;p=deb%2Fpackages.git

diff --git a/lib/Packages/DoIndex.pm b/lib/Packages/DoIndex.pm
index 064a18a..6d8d4b6 100644
--- a/lib/Packages/DoIndex.pm
+++ b/lib/Packages/DoIndex.pm
@@ -21,34 +21,37 @@ 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";
-    my $path = "$opts->{suite}[0]/";
+    my $path = "";
+    $path .= "source/" if $opts->{source};
+    $path .= "$opts->{suite}[0]/";
     $path .= "$opts->{archive}[0]/" if @{$opts->{archive}} == 1;
     $path .= "$opts->{subsection}[0]/" if @{$opts->{subsection}};
-    # we don't have translated index pages for subsections yet
-    $opts->{lang} = 'en' if @{$opts->{subsection}} or $file eq 'allpackages';
+    $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}";
 
     unless (@Packages::CGI::fatal_errors) {
@@ -56,8 +59,11 @@ sub send_file {
 	if (open( INDEX, '<', "$wwwdir/$path" )) {
 	    my %headers;
 	    $headers{'-charset'} = get_charset( $opts->{lang} );
-	    $headers{'-type'} = $mime_types{$opts->{format}} || 'text/plain';
+	    $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;
@@ -67,25 +73,10 @@ 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, $! ) );
 	}
     }
-
-    %$html_header = ( title => _g('Error'),
-		      lang => $opts->{lang},
-		      print_title => 1,
-		      print_search_field => 'packages',
-		      search_field_values => { 
-			  keywords => _g('search for a package'),
-			  searchon => 'default',
-			  arch => 'any',
-			  suite => 'all',
-			  section => 'all',
-			  exact => 1,
-			  debug => $Packages::CGI::debug,
-		      },
-		      );
 }
 
 1;