X-Git-Url: https://git.deb.at/?a=blobdiff_plain;f=lib%2FPackages%2FHTML.pm;h=90c95691805b873655feeafca185a9cb08d1ad48;hb=bcfcaa38f5df98ccff82e7ec1b9473b92b850c17;hp=da024339886679c74eca96bbf8df1a1a1bf9f470;hpb=87124f967c3da82618899b3d2c114981b12ffb7f;p=deb%2Fpackages.git

diff --git a/lib/Packages/HTML.pm b/lib/Packages/HTML.pm
index da02433..90c9569 100644
--- a/lib/Packages/HTML.pm
+++ b/lib/Packages/HTML.pm
@@ -8,6 +8,7 @@ use HTML::Entities;
 
 use Packages::CGI;
 use Packages::Search qw( read_entry_simple );
+use Packages::Config qw( :all );
 
 #use Packages::Util;
 #use Packages::I18N::Locale;
@@ -25,10 +26,6 @@ our @EXPORT = qw( header title trailer file_changed time_stamp
 		  ds_begin ds_item ds_end note title marker pdesc
 		  pdeplegend pkg_list pmoreinfo print_deps );
 
-our ( $HOME, $ROOT, $CONTACT_MAIL, $WEBMASTER_MAIL,
-      $SEARCH_PAGE, $SEARCH_CGI, $SEARCH_URL,
-      $SRC_SEARCH_URL, $CONTENTS_SEARCH_CGI,
-      $CN_HELP_URL, $BUG_URL, $SRC_BUG_URL, $QA_URL );
 our $CHANGELOG_URL = '/changelogs';
 
 sub img {
@@ -75,7 +72,7 @@ sub pdeplegend {
     my $str = "<table border=\"1\" summary=\"legend\"><tr>\n";
 
     foreach my $entry (@_) {
-	$str .= "<td><img src=\"../../Pics/$entry->[0].gif\" alt=\"[$entry->[0]]\" width=\"16\" height=\"16\">= $entry->[1]</td>";
+	$str .= "<td><img src=\"$ROOT/Pics/$entry->[0].gif\" alt=\"[$entry->[0]]\" width=\"16\" height=\"16\">= $entry->[1]</td>";
     }
 
     $str .= "\n</tr></table>\n";
@@ -120,6 +117,7 @@ sub pmoreinfo {
     
     my $name = $info{name} or return;
     my $env = $info{env} or return;
+    my $opts = $info{opts} or return;
     my $page = $info{data} or return;
     my $is_source = $info{is_source};
 
@@ -139,11 +137,14 @@ sub pmoreinfo {
     my $src_dir = $page->get_src('directory');
     if ($info{sourcedownload}) {
 	my $files = $page->get_src( 'files' );
+	my $path = (@{$opts->{archive}} >1) ?
+	    $opts->{suite} :
+	    "$opts->{suite}/$opts->{archive}[0]";
 	$str .= gettext( "Source Package:" );
-	$str .= " <a href=\"../source/$source\">$source</a>, ".
+	$str .= " <a href=\"/$path/source/$source\">$source</a>, ".
 	    gettext( "Download" ).":\n";
 
-	unless (@$files) {
+	unless (defined($files) and @$files) {
 	    $str .= gettext( "Not found" );
 	} else {
 	    foreach( @$files ) {
@@ -186,29 +187,31 @@ sub pmoreinfo {
    }
 
     if ($info{maintainers}) {
-	my @uploaders = @{$page->get_src( 'uploaders' )};
-	foreach (@uploaders) {
-	    $_->[0] = encode_entities( $_->[0], '&<>' );
-	}
-	my ($maint_name, $maint_mail ) = @{shift @uploaders}; 
-	unless (@uploaders) {
-	    $str .= "<p>\n".sprintf( gettext( "%s is responsible for this Debian package." ).
-				     "\n",
-				     "<a href=\"mailto:$maint_mail\">$maint_name</a>" 
-				     );
-	} else {
-	    my $up_str = "<a href=\"mailto:$maint_mail\">$maint_name</a>";
-	    my @uploaders_str;
-	    foreach (@uploaders) {
-		push @uploaders_str, "<a href=\"mailto:$_->[1]\">$_->[0]</a>";
+	my $uploaders = $page->get_src( 'uploaders' );
+	if ($uploaders && @$uploaders) {
+	    foreach (@$uploaders) {
+		$_->[0] = encode_entities( $_->[0], '&<>' );
+	    }
+	    my ($maint_name, $maint_mail) = @{shift @$uploaders}; 
+	    unless (@$uploaders) {
+		$str .= "<p>\n".sprintf( gettext( "%s is responsible for this Debian package." ).
+					 "\n",
+					 "<a href=\"mailto:$maint_mail\">$maint_name</a>" 
+					 );
+	    } else {
+		my $up_str = "<a href=\"mailto:$maint_mail\">$maint_name</a>";
+		my @uploaders_str;
+		foreach (@$uploaders) {
+		    push @uploaders_str, "<a href=\"mailto:$_->[1]\">$_->[0]</a>";
+		}
+		my $last_up = pop @uploaders_str;
+		$up_str .= ", ".join ", ", @uploaders_str if @uploaders_str;
+		$up_str .= sprintf( gettext( " and %s are responsible for this Debian package." ), $last_up );
+		$str .= "<p>\n$up_str ";
 	    }
-	    my $last_up = pop @uploaders_str;
-	    $up_str .= ", ".join ", ", @uploaders_str if @uploaders_str;
-	    $up_str .= sprintf( gettext( " and %s are responsible for this Debian package." ), $last_up );
-	    $str .= "<p>\n$up_str ";
 	}
 
-	$str .= sprintf( gettext( "See the <a href=\"%s\">developer information for %s</a>." )."</p>", $QA_URL.$source, $name );
+	$str .= sprintf( gettext( "See the <a href=\"%s\">developer information for %s</a>." )."</p>", $QA_URL.$source, $name ) if $source;
     }
 
     if ($info{search}) {
@@ -287,7 +290,7 @@ sub print_deps {
 	    my @results;
 	    my %short_descs;
 	    my $short_desc = $short_descs{$p_name} ||
-		(read_entry_simple( $packages, $p_name, $opts->{suite}))->[-1];
+		(read_entry_simple( $packages, $p_name, $opts->{h_archives}, $opts->{suite}))->[-1];
 	    if ( $short_desc ) {
 		if ( $is_old_pkgs ) {
 		    push @res_pkgs, dep_item( "/$opts->{suite}/$p_name",
@@ -500,7 +503,7 @@ MENU
 $KEYWORDS_LINE
 $DESC_LINE
 $meta
-<link href="$HOME/debian.css" rel="stylesheet" type="text/css" media="all">
+<link href="$ROOT/debian.css" rel="stylesheet" type="text/css" media="all">
 </head>
 <body>
 <div id="header">