X-Git-Url: https://git.deb.at/?p=deb%2Fpackages.git;a=blobdiff_plain;f=cgi-bin%2Fshow_package.pl;h=53d0f7be63c670c56bc15a8135d00cfeae20ba4b;hp=260d5cee36d9535459989bb0b49768c1f6c84929;hb=5ca21f1ba07a6b559395bec8d6bc1e528eb238d1;hpb=1a910dd8949a5a4ce3c93fa581a1f70fe5675997;ds=sidebyside

diff --git a/cgi-bin/show_package.pl b/cgi-bin/show_package.pl
index 260d5ce..53d0f7b 100755
--- a/cgi-bin/show_package.pl
+++ b/cgi-bin/show_package.pl
@@ -21,452 +21,368 @@ use HTML::Entities;
 use DB_File;
 use Benchmark;
 
-use lib "../lib";
-
 use Deb::Versions;
+use Packages::Config qw( $DBDIR $ROOT @SUITES @ARCHIVES @SECTIONS
+			 @ARCHITECTURES %FTP_SITES );
+use Packages::CGI;
 use Packages::Search qw( :all );
-use Packages::HTML ();
-
-my $HOME = "http://www.debian.org";
-my $ROOT = "";
-my $SEARCHPAGE = "http://packages.debian.org/";
-my @SUITES = qw( oldstable stable testing unstable experimental );
-my @DISTS = @SUITES;
-my @SECTIONS = qw( main contrib non-free );
-my @ARCHIVES = qw( us security installer );
-my @ARCHITECTURES = qw( alpha amd64 arm hppa hurd-i386 i386 ia64
-			kfreebsd-i386 mips mipsel powerpc s390 sparc );
-my %SUITES = map { $_ => 1 } @SUITES;
-my %SECTIONS = map { $_ => 1 } @SECTIONS;
-my %ARCHIVES = map { $_ => 1 } @ARCHIVES;
-my %ARCHITECTURES = map { $_ => 1 } @ARCHITECTURES;
-
+use Packages::HTML;
+use Packages::Page ();
 
+&Packages::CGI::reset;
 
 $ENV{PATH} = "/bin:/usr/bin";
 
 # Read in all the variables set by the form
 my $input;
-if ($ARGV[0] eq 'php') {
+if ($ARGV[0] && ($ARGV[0] eq 'php')) {
 	$input = new CGI(\*STDIN);
 } else {
 	$input = new CGI;
 }
 
 my $pet0 = new Benchmark;
+my $tet0 = new Benchmark;
 # use this to disable debugging in production mode completly
 my $debug_allowed = 1;
 my $debug = $debug_allowed && $input->param("debug");
-$debug = 0 if not defined($debug);
-$Packages::Search::debug = 1 if $debug > 1;
+$debug = 0 if !defined($debug) || $debug !~ /^\d+$/o;
+$Packages::CGI::debug = $debug;
 
-# If you want, just print out a list of all of the variables and exit.
-print $input->header if $debug;
-# print $input->dump;
-# exit;
+# read the configuration
+our $db_read_time ||= 0;
+
+&Packages::Config::init( '../' );
+
+if (my $path = $input->param('path')) {
+    my @components = map { lc $_ } split /\//, $path;
+
+    my %SUITES = map { $_ => 1 } @SUITES;
+    my %SECTIONS = map { $_ => 1 } @SECTIONS;
+    my %ARCHIVES = map { $_ => 1 } @ARCHIVES;
+    my %ARCHITECTURES = map { $_ => 1 } @ARCHITECTURES;
+
+    foreach (@components) {
+	if ($SUITES{$_}) {
+	    $input->param('suite', $_);
+	} elsif ($SECTIONS{$_}) {
+	    $input->param('section', $_);
+	} elsif ($ARCHIVES{$_}) {
+	    $input->param('archive', $_);
+	} elsif ($ARCHITECTURES{$_}) {
+	    $input->param('arch', $_);
+	}
+    }
+}
 
-my %params_def = ( package => { default => undef, match => '^([a-z0-9.+-]+)$' },
-		   suite => { default => undef, match => '^(\w+)$' },
-		   #format => { default => 'html', match => '^(\w+)$' }
+my ( $pkg, $suite, @sections, @archs, @archives, $format );
+my %params_def = ( package => { default => undef, match => '^([a-z0-9.+-]+)$',
+				var => \$pkg },
+		   suite => { default => undef, match => '^(\w+)$',
+			      var => \$suite },
+		   archive => { default => 'all', match => '^(\w+)$',
+				array => ',', var => \@archives,
+				replace => { all => [qw(us security)] } },
+		   section => { default => 'all', match => '^(\w+)$',
+				array => ',', var => \@sections,
+				replace => { all => \@SECTIONS } },
+		   arch => { default => 'any', match => '^(\w+)$',
+			     array => ',', var => \@archs,
+			     replace => { any => \@ARCHITECTURES } },
+		   format => { default => 'html', match => '^(\w+)$',
+                               var => \$format }
 		   );
-my %params = Packages::Search::parse_params( $input, \%params_def );
+my %opts;
+my %params = Packages::Search::parse_params( $input, \%params_def, \%opts );
 
-my $format = $params{values}{format}{final};
 #XXX: Don't use alternative output formats yet
 $format = 'html';
-
 if ($format eq 'html') {
     print $input->header;
-} elsif ($format eq 'xml') {
-#    print $input->header( -type=>'application/rdf+xml' );
-    print $input->header( -type=>'text/plain' );
 }
 
 if ($params{errors}{package}) {
-    print "Error: package not valid or not specified" if $format eq 'html';
-    exit 0;
+    fatal_error( "package not valid or not specified" );
+    $pkg = '';
 }
 if ($params{errors}{suite}) {
-    print "Error: package not valid or not specified" if $format eq 'html';
-    exit 0;
-}
-my $package = $params{values}{package}{final};
-my $suite = $params{values}{suite}{final};
-
-# for output
-if ($format eq 'html') {
-print Packages::HTML::header( title => "Details of package <i>$package</i> in $suite" ,
-			      lang => 'en',
-			      title_tag => "Details of package $package in $suite",
-			      print_title_above => 1
-			      );
-}
-
-# read the configuration
-my $topdir;
-if (!open (C, "../config.sh")) {
-    print "\nInternal Error: Cannot open configuration file.\n\n"
-if $format eq 'html';
-    exit 0;
+    fatal_error( "suite not valid or not specified" );
+    $suite = '';
 }
-while (<C>) {
-    $topdir = $1 if (/^\s*topdir="?(.*)"?\s*$/);
-}
-close (C);
-
-my $DBDIR = $topdir . "/files/db";
-
-my $obj1 = tie my %packages, 'DB_File', "$DBDIR/packages_small.db", O_RDONLY, 0666, $DB_BTREE
-    or die "couldn't tie DB $DBDIR/packages_small.db: $!";
-my $obj2 = tie my %packages_all, 'DB_File', "$DBDIR/packages_all_$suite.db", O_RDONLY, 0666, $DB_BTREE
-    or die "couldn't tie DB $DBDIR/packages_all_$suite.db: $!";
-my %allsuites = ();
-my @results = ();
-
 
-&read_entry( $package, \@results, \%allsuites );
-
-if (keys %allsuites == 0) {
-    print "No such package";
-    print "{insert link to search page with substring search}";
-    exit;
-}
-
-# sort is gross -- only fails for experimental though
-for (sort keys %allsuites) {
-    if ($suite eq $_) {
-	print "<strong>$_</strong> | ";
-    } else {
-	print "<a href=\"../$_/".uri_escape($package)."\">$_</a> | ";
+$opts{h_suites} =   { $suite => 1 };
+$opts{h_archs} =    { map { $_ => 1 } @archs };
+$opts{h_sections} = { map { $_ => 1 } @sections };
+$opts{h_archives} = { map { $_ => 1 } @archives };;
+
+my $DL_URL = "$pkg/download";
+my $FILELIST_URL = "$pkg/files";
+
+our (%packages, %packages_all, %sources_all, %descriptions);
+my (@results, @non_results);
+my $page = new Packages::Page( $pkg );
+my $package_page = "";
+my ($short_desc, $version, $archive, $section, $subsection) = ("")x5;
+
+sub gettext { return $_[0]; };
+
+my $st0 = new Benchmark;
+unless (@Packages::CGI::fatal_errors) {
+    my $dbmodtime = (stat("$DBDIR/packages_small.db"))[9];
+    tie %packages_all, 'DB_File', "$DBDIR/packages_all_$suite.db",
+    O_RDONLY, 0666, $DB_BTREE
+	or die "couldn't tie DB $DBDIR/packages_all_$suite.db: $!";
+    tie %sources_all, 'DB_File', "$DBDIR/sources_all_$suite.db",
+    O_RDONLY, 0666, $DB_BTREE
+	or die "couldn't tie DB $DBDIR/sources_all_$suite.db: $!";
+    if ($dbmodtime > $db_read_time) {
+	tie %packages, 'DB_File', "$DBDIR/packages_small.db",
+	O_RDONLY, 0666, $DB_BTREE
+	    or die "couldn't tie DB $DBDIR/packages_small.db: $!";
+	tie %descriptions, 'DB_File', "$DBDIR/descriptions.db",
+	O_RDONLY, 0666, $DB_BTREE
+	    or die "couldn't tie DB $DBDIR/descriptions.db: $!";
+
+    	debug( "tied databases ($dbmodtime > $db_read_time)" );
+	$db_read_time = $dbmodtime;
     }
-}
-print "<br>";
-if (not exists $allsuites{$suite}) {
-    print "Package not available in this suite";
-    exit;
-}
 
-for my $entry (@results) {
-    print join ":", @$entry;
-    print "<br>\n";
-    my ($foo, $arch, $section, $subsection,
-	$priority, $version) = @$entry;
-    print "<pre>".$packages_all{"$package $arch $version"}."</pre>";
-}
+    read_entry_all( \%packages, $pkg, \@results, \@non_results, \%opts );
 
-&showpackage($package);
+    unless (@results || @non_results ) {
+	fatal_error( "No such package".
+		     "{insert link to search page with substring search}" );
+    } else {
+	unless (@results) {
+	    fatal_error( "Package not available in this suite" );
+	} else {
+	    for my $entry (@results) {
+		debug( join(":", @$entry), 1 );
+		my (undef, $archive, undef, $arch, $section, $subsection,
+		    $priority, $version) = @$entry;
+		
+		my $data = $packages_all{"$pkg $arch $version"};
+		$page->merge_data($pkg, $version, $arch, $data) or debug( "Merging $pkg $arch $version FAILED", 2 );
+	    }
 
-sub showpackage {
-    my ( $pkg ) = @_;
-    
-    my $name = $pkg->get_name;
-    
-    if ( $pkg->is_virtual ) { 
-	print_virt_pack( @_ ); 
-	return;
-    }
-    
-    my @all_archs = ( @{$env->{archs}}, 'all' );
-    
-    my $page = new Packages::Page( $name,
-				   { architectures => $env->{archs} } );
-    my $d = $page->set_data( $env->{db}, $pkg );
-    
-    my %versions = $pkg->get_arch_versions( $env->{archs} );
-    my %subsuites   = $pkg->get_arch_fields( 'subdistribution', 
-					     $env->{archs} );
-    my %filenames   = $pkg->get_arch_fields( 'filename',
-					     $env->{archs} );
-    my %file_md5s   = $pkg->get_arch_fields( 'md5sum',
-					     $env->{archs} );
-    
-    my $subsuite_kw = $d->{subsuite} || $env->{distribution};
-    my $size_kw = exists $d->{sizes_deb}{i386} ? $d->{sizes_deb}{i386} : first_val($d->{sizes_deb});
-    
-    
-    foreach my $lang (@{$env->{langs}}) {
-	&Generated::Strings::string_lang($lang);
-	
-	my $dirname = "$env->{dest_dir}/$d->{subsection}";
-	my $filename = "$dirname/$name.$lang.html";
-	
-	unless (( $lang eq 'en' ) 
-		|| $env->{db}->is_translated( $name, $d->{version},
-					      ${$versions{v2a}{$d->{version}}}[0],
-					      $lang )) {
-	    $files->delete_file( $filename )
-		if $files->file_exists( $filename );
-	    next;
-	}
-	progress() if $env->{opts}{progress};
-	
-	#
-	# process description
-	#
-	my $short_desc = encode_entities( $env->{db}->get_short_desc( $d->{desc_md5},
-								      $lang ), "<>&\"" );
-	my $long_desc = encode_entities( $env->{db}->get_long_desc( $d->{desc_md5},
-								    $lang ), "<>&\"" );
-	
-	$long_desc =~ s,((ftp|http|https)://[\S~-]+?/?)((\&gt\;)?[)]?[']?[:.\,]?(\s|$)),<a href=\"$1\">$1</a>$3,go; # syntax highlighting -> '];
-	$long_desc =~ s/\A //o;
-	$long_desc =~ s/\n /\n/sgo;
-	$long_desc =~ s/\n.\n/\n<p>\n/go;
-	$long_desc =~ s/(((\n|\A) [^\n]*)+)/\n<pre>$1\n<\/pre>/sgo;
-	
-	$long_desc = conv_desc( $lang, $long_desc );
-	$short_desc = conv_desc( $lang, $short_desc );
-	
-	#
-	# begin output
-	#
-	my $package_page = header( title => $name, lang => $lang,
-				   desc => $short_desc,
-				   keywords => "$env->{distribution}, $subsuite_kw, $d->{section}, $d->{subsection}, size:$size_kw $d->{version}" );
-	$package_page .= simple_menu( [ gettext( "Distribution:" ),
-					gettext( "Overview over this distribution" ),
-					"../",
-					$env->{distribution} ],
-				      [ gettext( "Section:" ),
-					gettext( "All packages in this section" ),
-					"../$d->{subsection}/",
-					$d->{subsection} ],
-				      );
-	
-	my $title .= sprintf( gettext( "Package: %s (%s)" ), $name, $d->{v_str_simple} );
-	$title .=  " ".marker( $d->{subsuite} ) if $d->{subsuite};
-	$title .=  " ".marker( $d->{section} ) if $d->{section} ne 'main';
-	$package_page .= title( $title );
-	
-	$package_page .= "<h2>".gettext( "Versions:" )." $d->{v_str_arch}</h2>\n" 
-	    unless $d->{version} eq $d->{v_str_simple};
-	
-	if ($env->{distribution} eq "experimental") {
-	    $package_page .= note( gettext( "Experimental package"),
-				   gettext( "Warning: This package is from the <span class=\"pred\">experimental</span> distribution. That means it is likely unstable or buggy, and it may even cause data loss. If you ignore this warning and install it nevertheless, you do it on your own risk.")."</p><p>".
-				   gettext( "Users of experimental packages are encouraged to contact the package maintainers directly in case of problems." )
-				   );
-	}
-	if ($d->{section} eq "debian-installer") {
-	    $package_page .= note( gettext( "debian-installer udeb package"),
-				   gettext( "Warning: This package is intended for the use in building <a href=\"http://www.debian.org/devel/debian-installer\">debian-installer</a> images only. Do not install it on a normal Debian system." )
-				   );
-	}
-	$package_page .= pdesc( $short_desc, $long_desc );
-	
-	#
-	# display dependencies
-	#
-	my $dep_list = print_deps( $env, $lang, $pkg, $d->{depends},    'depends' );
-	$dep_list   .= print_deps( $env, $lang, $pkg, $d->{recommends}, 'recommends' );
-	$dep_list   .= print_deps( $env, $lang, $pkg, $d->{suggests},   'suggests' );
-	
-	if ( $dep_list ) {
-	    $package_page .= "<div id=\"pdeps\">\n";
-	    $package_page .= sprintf( "<h2>".gettext( "Other Packages Related to %s" )."</h2>\n", $name );
-	    if ($env->{distribution} eq "experimental") {
-		$package_page .= note( gettext( "Note that the \"<span class=\"pred\">experimental</span>\" distribution is not self-contained; missing dependencies are likely found in the \"<a href=\"../../unstable/\">unstable</a>\" distribution." ) );
+	    $version = $page->{newest};
+	    my $source = $page->get_newest( 'source' );
+	    my $source_version = $page->get_newest( 'source-version' )
+		|| $version;
+	    my $src_data = $sources_all{"$source $source_version"};
+	    unless ($src_data) { #fucking binNMUs
+		my $versions = $page->get_versions;
+		my $sources = $page->get_arch_field( 'source' );
+		my $source_versions = $page->get_arch_field( 'source-version' );
+		foreach (version_sort keys %$versions) {
+		    $source = $sources->{$versions->{$_}[0]};
+		    $source = $source_versions->{$versions->{$_}[0]}
+		    || $version;
+		    $src_data = $sources_all{"$source $source_version"};
+		    last if $src_data;
+		}
+		error( "couldn't find source package" ) unless $src_data;
+	    }
+	    $page->add_src_data( $source, $source_version, $src_data );
+
+	    my $st1 = new Benchmark;
+	    my $std = timediff($st1, $st0);
+	    debug( "Data search and merging took ".timestr($std) );
+
+	    my $encodedpkg = uri_escape( $pkg );
+	    my ($v_str, $v_str_arch, $v_str_arr) = $page->get_version_string();
+	    my $did = $page->get_newest( 'description' );
+	    $archive = $page->get_newest( 'archive' );
+	    $section = $page->get_newest( 'section' );
+	    $subsection = $page->get_newest( 'subsection' );
+	    my $filenames = $page->get_arch_field( 'filename' );
+	    my $file_md5sums = $page->get_arch_field( 'md5sum' );
+	    my $archives = $page->get_arch_field( 'archive' );
+	    my $sizes_inst = $page->get_arch_field( 'installed-size' );
+	    my $sizes_deb = $page->get_arch_field( 'size' );
+	    my @archs = sort $page->get_architectures;
+
+	    # process description
+ 	    #
+	    my $desc = $descriptions{$did};
+	    $short_desc = encode_entities( $1, "<>&\"" )
+		if $desc =~ s/^(.*)$//m;
+	    my $long_desc = encode_entities( $desc, "<>&\"" );
+	    
+	    $long_desc =~ s,((ftp|http|https)://[\S~-]+?/?)((\&gt\;)?[)]?[']?[:.\,]?(\s|$)),<a href=\"$1\">$1</a>$3,go; # syntax highlighting -> '];
+ 	    $long_desc =~ s/\A //o;
+ 	    $long_desc =~ s/\n /\n/sgo;
+ 	    $long_desc =~ s/\n.\n/\n<p>\n/go;
+ 	    $long_desc =~ s/(((\n|\A) [^\n]*)+)/\n<pre>$1\n<\/pre>/sgo;
+# 	    $long_desc = conv_desc( $lang, $long_desc );
+# 	    $short_desc = conv_desc( $lang, $short_desc );
+
+	    my %all_suites;
+	    foreach (@results, @non_results) {
+		my $a = $_->[1];
+		my $s = $_->[2];
+		if ($a =~ /^(?:us|security)$/o) {
+		    $all_suites{$s}++;
+		} else {
+		    $all_suites{"$s/$a"}++;
+		}
+	    }
+	    foreach (suites_sort(keys %all_suites)) {
+		if (("$suite/$archive" eq $_)
+		    || (!$all_suites{"$suite/$archive"} && ($suite eq $_))) {
+		    $package_page .= "[ <strong>$_</strong> ] ";
+		} else {
+		    $package_page .=
+			"[ <a href=\"$ROOT/$_/".uri_escape($pkg)."\">$_</a> ] ";
+		}
 	    }
+	    $package_page .= '<br>';
+
+ 	    $package_page .= simple_menu( [ gettext( "Distribution:" ),
+ 					    gettext( "Overview over this suite" ),
+ 					    "/$suite/",
+ 					    $suite ],
+ 					  [ gettext( "Section:" ),
+ 					    gettext( "All packages in this section" ),
+ 					    "/$suite/$subsection/",
+ 					    $subsection ],
+ 					  );
+
+ 	    my $title .= sprintf( gettext( "Package: %s (%s)" ), $pkg, $v_str );
+ 	    $title .=  " ".marker( $archive ) if $archive ne 'us';
+ 	    $title .=  " ".marker( $section ) if $section ne 'main';
+ 	    $package_page .= title( $title );
 	    
-	    $package_page .= pdeplegend( [ 'dep',  gettext( 'depends' ) ],
-					 [ 'rec',  gettext( 'recommends' ) ],
-					 [ 'sug',  gettext( 'suggests' ) ], );
+ 	    $package_page .= "<h2>".gettext( "Versions:" )." $v_str_arch</h2>\n" 
+ 		unless $version eq $v_str;
 	    
-	    $package_page .= $dep_list;
-	    $package_page .= "</div> <!-- end pdeps -->\n";
-	}
-	
-	#
-	# Download package
-	#
-	my $encodedpack = uri_escape( $name );
-	$package_page .= "<div id=\"pdownload\">";
-	$package_page .= sprintf( "<h2>".gettext( "Download %s\n" )."</h2>",
-				  $name ) ;
-	$package_page .= "<table border=\"1\" summary=\"".gettext("The download table links to the download of the package and a file overview. In addition it gives information about the package size and the installed size.")."\">\n";
-	$package_page .= "<caption class=\"hidecss\">".gettext("Download for all available architectures")."</caption>\n";
-	$package_page .= "<tr>\n";
-	$package_page .= "<th>".gettext("Architecture")."</th><th>".gettext("Files")."</th><th>".gettext( "Package Size")."</th><th>".gettext("Installed Size")."</th></tr>\n";
-	foreach my $a ( @all_archs ) {
-	    if ( exists $versions{a2v}{$a} ) {
-	        $package_page .= "<tr>\n";
+ 	    if ($suite eq "experimental") {
+ 		$package_page .= note( gettext( "Experimental package"),
+ 				       gettext( "Warning: This package is from the <span class=\"pred\">experimental</span> distribution. That means it is likely unstable or buggy, and it may even cause data loss. If you ignore this warning and install it nevertheless, you do it on your own risk.")."</p><p>".
+ 				       gettext( "Users of experimental packages are encouraged to contact the package maintainers directly in case of problems." )
+ 				       );
+ 	    }
+ 	    if ($subsection eq "debian-installer") {
+ 		note( gettext( "debian-installer udeb package"),
+		      gettext( "Warning: This package is intended for the use in building <a href=\"http://www.debian.org/devel/debian-installer\">debian-installer</a> images only. Do not install it on a normal Debian system." )
+		      );
+ 	    }
+ 	    $package_page .= pdesc( $short_desc, $long_desc );
+
+ 	    #
+ 	    # display dependencies
+ 	    #
+	    my $dep_list;
+ 	    $dep_list = print_deps( \%packages, \%opts, $pkg,
+				       $page->get_dep_field('depends'),
+				       'depends' );
+ 	    $dep_list .= print_deps( \%packages, \%opts, $pkg,
+				       $page->get_dep_field('recommends'),
+				       'recommends' );
+ 	    $dep_list .= print_deps( \%packages, \%opts, $pkg,
+				       $page->get_dep_field('suggests'),
+				       'suggests' );
+
+ 	    if ( $dep_list ) {
+ 		$package_page .= "<div id=\"pdeps\">\n";
+ 		$package_page .= sprintf( "<h2>".gettext( "Other Packages Related to %s" )."</h2>\n", $pkg );
+ 		if ($suite eq "experimental") {
+ 		    note( gettext( "Note that the \"<span class=\"pred\">experimental</span>\" distribution is not self-contained; missing dependencies are likely found in the \"<a href=\"/unstable/\">unstable</a>\" distribution." ) );
+ 		}
+		
+ 		$package_page .= pdeplegend( [ 'dep',  gettext( 'depends' ) ],
+ 					     [ 'rec',  gettext( 'recommends' ) ],
+ 					     [ 'sug',  gettext( 'suggests' ) ], );
+		
+ 		$package_page .= $dep_list;
+		$package_page .= "</div> <!-- end pdeps -->\n";
+	    }
+
+	    #
+	    # Download package
+	    #
+	    my $encodedpack = uri_escape( $pkg );
+	    $package_page .= "<div id=\"pdownload\">";
+	    $package_page .= sprintf( "<h2>".gettext( "Download %s\n" )."</h2>",
+				      $pkg ) ;
+	    $package_page .= "<table border=\"1\" summary=\"".gettext("The download table links to the download of the package and a file overview. In addition it gives information about the package size and the installed size.")."\">\n";
+	    $package_page .= "<caption class=\"hidecss\">".gettext("Download for all available architectures")."</caption>\n";
+	    $package_page .= "<tr>\n";
+	    $package_page .= "<th>".gettext("Architecture")."</th><th>".gettext("Files")."</th><th>".gettext( "Package Size")."</th><th>".gettext("Installed Size")."</th></tr>\n";
+	    foreach my $a ( @archs ) {
+		$package_page .= "<tr>\n";
 		$package_page .=  "<th><a href=\"$DL_URL?arch=$a";
-		# \&amp\;file=\" method=\"post\">\n<p>";
-		$package_page .=  "&amp;file=".uri_escape($filenames{a2f}->{$a});
-		$package_page .=  "&amp;md5sum=$file_md5s{a2f}->{$a}";
+		$package_page .=  "&amp;file=".uri_escape($filenames->{$a});
+		$package_page .=  "&amp;md5sum=$file_md5sums->{$a}";
 		$package_page .=  "&amp;arch=$a";
 		# there was at least one package with two
 		# different source packages on different
 		# archs where one had a security update
 		# and the other one not
-		if ($subsuites{a2f}{$a}
-		    && ($subsuites{a2f}{$a} =~ /security/o) ) {
-		    $package_page .=  "&amp;type=security";
-		} elsif ($subsuites{a2f}{$a}
-			 && ($subsuites{a2f}{$a} =~ /volatile/o) ) {
-		    $package_page .=  "&amp;type=volatile";
-		} elsif ($d->{is_nonus}) {
-		    $package_page .=  "&amp;type=nonus";
-		} else {
+		for ($archives->{$a}) {
+		    /security/o &&  do {
+			$package_page .=  "&amp;type=security"; last };
+		    /volatile/o &&  do {
+			$package_page .=  "&amp;type=volatile"; last };
+		    /non-us/io  &&  do {
+			$package_page .=  "&amp;type=nonus"; last };
 		    $package_page .=  "&amp;type=main";
 		}
 		$package_page .=  "\">$a</a></th>\n";
 		$package_page .= "<td>";
-		if ( $env->{distribution} ne "experimental" ) {
-		    $package_page .= sprintf( "[<a href=\"%s\">".gettext( "list of files" )."</a>]\n", "$FILELIST_URL$encodedpack&amp;version=$env->{distribution}&amp;arch=$a", $name );
+		if ( $suite ne "experimental" ) {
+		    $package_page .= sprintf( "[<a href=\"%s\">".gettext( "list of files" )."</a>]\n", "$FILELIST_URL$encodedpkg&amp;version=$suite&amp;arch=$a", $pkg );
 		} else {
-		    $package_page .= "no files";
+		    $package_page .= gettext( "no current information" );
 		}
 		$package_page .= "</td>\n<td>";
-		my $size = $d->{sizes_deb}{$a};
-		$package_page .=  "$size";
+		$package_page .=  floor(($sizes_deb->{$a}/102.4)+0.5)/10;
 		$package_page .= "</td>\n<td>";
-		my $inst_size = $d->{sizes_inst}{$a};
-		$package_page .=  "$inst_size";
+		$package_page .=  $sizes_inst->{$a};
 		$package_page .= "</td>\n</tr>";
 	    }
-	}
-	$package_page .= "</table><p>".gettext ( "Size is measured in kBytes." )."</p>\n";
-	$package_page .= "</div> <!-- end pdownload -->\n";
-	
-	#
-	# more information
-	#
-	$package_page .= pmoreinfo( name => $name, env => $env, data => $d,
-				    bugreports => 1, sourcedownload => 1,
-				    changesandcopy => 1, maintainers => 1,
-				    search => 1 );
-	
-	#
-	# Trailer
-	#
-	my @tr_langs = ();
-	foreach my $l (@{$env->{langs}}) {
-	    next if $l eq $lang;
-	    push @tr_langs, $l if ( $l eq 'en' ) 
-		|| $env->{db}->is_translated( $name, $d->{version}, 
-					      ${$versions{v2a}{$d->{version}}}[0],
-					      $l );
-	}
-	$package_page .= trailer( '../..', $name, $lang, @tr_langs );
-	
-	#
-	# write file
-	#
-	$files->update_file( $filename, $package_page );
-	
-	#
-	# create data sheet
-	#
-	if($lang eq 'en') {
-	    my $data_sheet = header( title => "$name -- Data sheet",
-				     lang => "en",
-				     desc => $short_desc,
-				     keywords => "$env->{distribution}, $subsuite_kw, $d->{section}, $d->{subsection}, size:$size_kw $d->{version}" );	    
-	    
-	    my $ds_title = $name;
-	    if ( $d->{subsuite} ) {
-		$ds_title .=  " ".marker( $d->{subsuite} );
-	    }
-	    if ( $d->{section} ne 'main' ) {
-		$ds_title .=  " ".marker( $d->{section} );
-	    }
-	    $data_sheet .= title( $ds_title );
-
-	    $data_sheet .= ds_begin;
-	    $data_sheet .= ds_item(gettext( "Version" ), $d->{v_str_arch});
-	    
-	    my @uploaders = @{$d->{uploaders}};
-	    my ( $maint_name, $maint_email ) = @{shift @uploaders};
-	    $data_sheet .= ds_item(gettext( "Maintainer" ),
-				   "<a href=\"$DDPO_URL".
-				   uri_escape($maint_email).
-				   "\">".encode_entities($maint_name, '&<>')."</a>" );
-	    if (@uploaders) {
-		my @uploaders_str;
-		foreach (@uploaders) {
-		    push @uploaders_str, "<a href=\"$DDPO_URL".uri_escape($_->[1])."\">".encode_entities($_->[0], '&<>')."</a>";
-		}
-		$data_sheet .= ds_item(gettext( "Uploaders" ),
-				       join( ",\n ", @uploaders_str ));
-	    }
-	    $data_sheet .= ds_item(gettext( "Section" ),
-				   "<a href=\"../$d->{subsection}/\">$d->{subsection}</a>");
-	    $data_sheet .= ds_item(gettext( "Priority" ),
-				   "<a href=\"../$d->{priority}\">$d->{priority}</a>");
-	    $data_sheet .= ds_item(gettext( "Essential" ),
-				   "<a href=\"../essential\">".
-				   gettext("yes")."</a>")
-		if $d->{essential} =~ /yes/i;
-	    $data_sheet .= ds_item(gettext( "Source package" ),
-				   "<a href=\"../source/$d->{src_name}\">$d->{src_name}</a>");
-	    $data_sheet .= print_deps_ds( $env, $pkg, $d->{depends},    'Depends' );
-	    $data_sheet .= print_deps_ds( $env, $pkg, $d->{recommends}, 'Recommends' );
-	    $data_sheet .= print_deps_ds( $env, $pkg, $d->{suggests},   'Suggests' );
-	    $data_sheet .= print_deps_ds( $env, $pkg, $d->{enhances},   'Enhances' );
-	    $data_sheet .= print_deps_ds( $env, $pkg, $d->{conflicts},  'Conflicts' );
-	    $data_sheet .= print_deps_ds( $env, $pkg, $d->{provides},   'Provides' );
-#	    $data_sheet .= print_reverse_rel_ds( $env, $pkg, \%versions, 'Depends' );
-#	    $data_sheet .= print_reverse_rel_ds( $env, $pkg, \%versions, 'Recommends' );
-#	    $data_sheet .= print_reverse_rel_ds( $env, $pkg, \%versions, 'Suggests' );
-#	    $data_sheet .= print_reverse_rel_ds( $env, $pkg, \%versions, 'Enhances' );
-#	    $data_sheet .= print_reverse_rel_ds( $env, $pkg, \%versions, 'Provides' );
-#	    $data_sheet .= print_reverse_rel_ds( $env, $pkg, \%versions, 'Conflicts' );
-#	    $data_sheet .= print_reverse_rel_ds( $env, $pkg, \%versions, 'Build-Depends' );
-#	    $data_sheet .= print_reverse_rel_ds( $env, $pkg, \%versions, 'Build-Depends-Indep' );
-#	    $data_sheet .= print_reverse_rel_ds( $env, $pkg, \%versions, 'Build-Conflicts' );
-
-#	    if ( $name eq 'libc6' ) {
-#		use Data::Dumper;
-#		print STDERR Dumper( $pkg );
-#	    }
-
-	    $data_sheet .= ds_end;
+	    $package_page .= "</table><p>".gettext ( "Size is measured in kBytes." )."</p>\n";
+	    $package_page .= "</div> <!-- end pdownload -->\n";
 	    
-	    $data_sheet .= trailer( '../..', $name );
-
-	    my $ds_filename = "$dirname/ds_$name.$lang.html";
 	    #
-	    # write file
+	    # more information
 	    #
-	    print $data_sheet;
-	}
-    }
-}
-
-&printfooter;
-
-sub read_entry {
-    my ($key, $results, $allsuites) = @_;
-    my $result = $packages{$key};
-    foreach (split /\000/, $result) {
-	my @data = split ( /\s/, $_, 7 );
-	print "DEBUG: Considering entry ".join( ':', @data)."<br>" if $debug > 2;
-	if ($suite eq $data[0]) {
-	    print "DEBUG: Using entry ".join( ':', @data)."<br>" if $debug > 2;
-	    push @$results, [@data];
+	    $package_page .= pmoreinfo( name => $pkg, data => $page,
+					opts => \%opts,
+					env => \%FTP_SITES,
+					bugreports => 1, sourcedownload => 1,
+					changesandcopy => 1, maintainers => 1,
+					search => 1 );
 	}
-	$allsuites->{$data[0]} = 1;
     }
 }
 
-# TODO: move to common lib:
-sub printfooter {
-    print <<END;
-</div>
-
-<hr class="hidecss">
-<p style="text-align:right;font-size:small;font-stlye:italic"><a href="$SEARCHPAGE">Packages search page</a></p>
+use Data::Dumper;
+debug( "Final page object:\n".Dumper($page), 3 );
 
-</div>
-END
+print Packages::HTML::header( title => "Details of package <em>$pkg</em> in $suite" ,
+			      lang => 'en',
+			      desc => $short_desc,
+			      keywords => "$suite, $archive, $section, $subsection, $version",
+			      title_tag => "Details of package $pkg in $suite",
+			      );
 
-    my $pete = new Benchmark;
-    my $petd = timediff($pete, $pet0);
-    print "Total page evaluation took ".timestr($petd)."<br>"
-	if $debug_allowed;
+print_errors();
+print_hints();
+print_msgs();
+print_debug();
+print_notes();
 
-    print $input->end_html;
+unless (@Packages::CGI::fatal_errors) {
+    print $package_page;
 }
+my $tet1 = new Benchmark;
+my $tetd = timediff($tet1, $tet0);
+print "Total page evaluation took ".timestr($tetd)."<br>"
+    if $debug_allowed;
+
+my $trailer = Packages::HTML::trailer( $ROOT );
+$trailer =~ s/LAST_MODIFIED_DATE/gmtime()/e; #FIXME
+print $trailer;
 
 # vim: ts=8 sw=4