X-Git-Url: https://git.deb.at/?a=blobdiff_plain;f=lib%2FPackages%2FDoFilelist.pm;h=ee092e3163ccc1e7afbea4be8eb7a4779925db07;hb=e9e5399ad699b724ed7d236b43f76b3ff85050bd;hp=714171bc9c2213c2faa115ac5adec46be2f8d56d;hpb=e6999b858367d9d83e0fa2c32cddfd31b4416486;p=deb%2Fpackages.git

diff --git a/lib/Packages/DoFilelist.pm b/lib/Packages/DoFilelist.pm
index 714171b..ee092e3 100644
--- a/lib/Packages/DoFilelist.pm
+++ b/lib/Packages/DoFilelist.pm
@@ -4,10 +4,7 @@ use strict;
 use warnings;
 
 use POSIX;
-use URI::Escape;
-use HTML::Entities;
 use DB_File;
-use Benchmark ':hireswallclock';
 use Exporter;
 
 use Deb::Versions;
@@ -16,7 +13,6 @@ use Packages::Config qw( $DBDIR $ROOT @SUITES @ARCHIVES @SECTIONS
 use Packages::CGI;
 use Packages::DB;
 use Packages::Search qw( :all );
-use Packages::HTML;
 use Packages::Page ();
 use Packages::SrcPage ();
 
@@ -24,48 +20,44 @@ our @ISA = qw( Exporter );
 our @EXPORT = qw( do_filelist );
 
 sub do_filelist {
-    my ($params, $opts, $html_header, $menu, $page_content) = @_;
+    my ($params, $opts, $page_content) = @_;
+    my $cat = $opts->{cat};
 
     if ($params->{errors}{package}) {
-	fatal_error( "package not valid or not specified" );
+	fatal_error( $cat->g( "package not valid or not specified" ) );
     }
     if ($params->{errors}{suite}) {
-	fatal_error( "suite not valid or not specified" );
+	fatal_error( $cat->g( "suite not valid or not specified" ) );
     }
     if ($params->{errors}{arch}) {
-	fatal_error( "arch not valid or not specified" );
+	fatal_error( $cat->g( "architecture not valid or not specified" ) );
     }
 
-    $$menu = '';
     my $pkg = $opts->{package};
     my $suite = $opts->{suite}[0];
     my $arch = $opts->{arch}[0] ||'';
-
-    %$html_header = ( title => "Filelist of package <em>$pkg</em> in <em>$suite</em> of arch <em>$arch</em>",
-		      title_tag => "Filelist of of package $pkg/$suite/$arch",
-		      lang => 'en',
-		      keywords => "debian, $suite, $arch, filelist",
-		      print_title => 1,
-		      );
+    $page_content->{pkg} = $pkg;
+    $page_content->{suite} = $suite;
+    $page_content->{arch} = $arch;
 
     unless (@Packages::CGI::fatal_errors) {
 	if (tie my %contents, 'DB_File', "$DBDIR/contents/filelists_${suite}_${arch}.db",
 	    O_RDONLY, 0666, $DB_BTREE) {
 
 	    unless (exists $contents{$pkg}) {
-		fatal_error( "No such package in this suite on this arch" );
+		fatal_error( $cat->g( "No such package in this suite on this architecture." ) );
 	    } else {
 		my @files = unpack "L/(CC/a)", $contents{$pkg};
-		my $file = "";
-		$$page_content .= '<div id="pfilelist"><pre>';
+		my $file = '';
+
+		$page_content->{files} = [];
 		for (my $i=0; $i<scalar @files;) {
 		    $file = substr($file, 0, $files[$i++]).$files[$i++];
-		    $$page_content .= "$file\n";
+		    push @{$page_content->{files}}, "/$file";
 		}
-		$$page_content .= '</pre></div>';
 	    }
 	} else {
-	    fatal_error( "Invalid suite/arch combination" );
+	    fatal_error( $cat->g( "Invalid suite/architecture combination" ) );
 	}
     }
 }