Packages::DoSearchContents: Avoid breaking the grep pipe

[deb/packages.git] / lib / Packages / DoIndex.pm

diff --git a/lib/Packages/DoIndex.pm b/lib/Packages/DoIndex.pm
index 0ed874a24ce31a4dcf5865a3036c0cd25330fe58..45a5b494bf8a7ba16da24b9a0a1b0093590190c9 100644 (file)
--- a/lib/Packages/DoIndex.pm
+++ b/lib/Packages/DoIndex.pm
@@ -21,17 +21,11 @@ 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) = @_;
 
     if ($params->{errors}{suite}) {
        fatal_error( _g( "suite not valid or not specified" ) );
@@ -52,15 +46,23 @@ sub send_file {
     $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';
-    $path .= "$file.$opts->{lang}.$opts->{format}";
+
+    #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{'-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;