X-Git-Url: https://git.deb.at/?a=blobdiff_plain;f=lib%2FPackages%2FDoFilelist.pm;h=188cfb8bd6e59acedfc5e3dc1daeeb25dadad7f3;hb=cf56c281cb5054022e986de58ca288c71f939474;hp=20eb67fba6397010d133c4071a7bbb5ef4ac81bb;hpb=3bb6c9d9922b0487901c02962b1d64c525f1bdd7;p=deb%2Fpackages.git

diff --git a/lib/Packages/DoFilelist.pm b/lib/Packages/DoFilelist.pm
index 20eb67f..188cfb8 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;
@@ -17,7 +14,6 @@ use Packages::I18N::Locale;
 use Packages::CGI;
 use Packages::DB;
 use Packages::Search qw( :all );
-use Packages::HTML;
 use Packages::Page ();
 use Packages::SrcPage ();
 
@@ -25,48 +21,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( _g( "package not valid or not specified" ) );
+	fatal_error( $cat->g( "package not valid or not specified" ) );
     }
     if ($params->{errors}{suite}) {
-	fatal_error( _g( "suite not valid or not specified" ) );
+	fatal_error( $cat->g( "suite not valid or not specified" ) );
     }
     if ($params->{errors}{arch}) {
-	fatal_error( _g( "architecture 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 => sprintf( _g( "Filelist of package <em>%s</em> in <em>%s</em> of architecture <em>%s</em>" ), $pkg, $suite, $arch ),
-		      title_tag => sprintf( _g( "Filelist of of package %s/%s/%s" ), $pkg, $suite, $arch ),
-		      lang => $opts->{lang},
-		      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( _g( "No such package in this suite on this architecture." ) );
+		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( _g( "Invalid suite/architecture combination" ) );
+	    fatal_error( $cat->g( "Invalid suite/architecture combination" ) );
 	}
     }
 }