X-Git-Url: https://git.deb.at/?p=deb%2Fpackages.git;a=blobdiff_plain;f=lib%2FPackages%2FHTML.pm;h=826461a0e944cb035a3a074c44802fd6373116a0;hp=873a7ea0ab3f00240cd97d0a81d5428c5a512c6c;hb=5ca21f1ba07a6b559395bec8d6bc1e528eb238d1;hpb=f49363dc272472174dd57c663c2688c33af927cd

diff --git a/lib/Packages/HTML.pm b/lib/Packages/HTML.pm
index 873a7ea..826461a 100644
--- a/lib/Packages/HTML.pm
+++ b/lib/Packages/HTML.pm
@@ -6,6 +6,10 @@ use warnings;
 use URI::Escape;
 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;
 #use Packages::I18N::Languages;
@@ -20,12 +24,8 @@ our @ISA = qw( Exporter );
 our @EXPORT = qw( header title trailer file_changed time_stamp
 		  read_md5_hash write_md5_hash simple_menu
 		  ds_begin ds_item ds_end note title marker pdesc
-		  pdeplegend pkg_list pmoreinfo );
+		  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 {
@@ -55,19 +55,6 @@ sub marker {
     return "[<span class=\"pred\">$_[0]</span>]";
 }
 
-sub note {
-    my ( $title, $note ) = @_;
-    my $str = "";
-
-    if ($note) {
-	$str .= "<h2 class=\"pred\">$title</h2>";
-    } else {
-	$note = $title;
-    }
-    $str .= "<p>$note</p>";
-    return $str;
-}
-
 sub pdesc {
     my ( $short_desc, $long_desc ) = @_;
     my $str = "";
@@ -92,45 +79,46 @@ sub pdeplegend {
     return $str;
 }
 
-sub pkg_list {
-    my ( $pkgs, $lang, $env ) = @_;
-
-    my $str = "";
-    foreach my $p ( @$pkgs ) {
-	my $p_pkg = $env->{db}->get_pkg( $p );
-
-	if ( $p_pkg ) {
-	    if ($p_pkg->is_virtual) {
-		$str .= "<dt><a href=\"../virtual/$p\">$p</a></dt>\n".
-		    "\t<dd>".gettext("Virtual package")."</dd>\n";
-	    } else {
-		my %subsections = $p_pkg->get_arch_fields( 'section',
-							   $env->{archs} );
-		my $subsection = $subsections{max_unique};
-		my %desc_md5s = $p_pkg->get_arch_fields( 'description-md5', 
-							 $env->{archs} );
-		my $short_desc = conv_desc( $lang,
-					    encode_entities( $env->{db}->get_short_desc( $desc_md5s{max_unique}, $lang ), "<>&\"" ) );
-		$str .= "<dt><a href=\"../$subsection/$p\">$p</a></dt>\n".
-		    "\t<dd>$short_desc</dd>\n";
-	    }
-	} else {
-	    $str .= "<dt>$p</dt>\n\t<dd>".gettext("Not available")."</dd>\n";
-	}
-    }
-    if ($str) {
-	$str = "<dl>$str</dl>\n";
-    }
-
-    return $str;
-}
+# sub pkg_list {
+#     my ( $pkgs, $lang, $env ) = @_;
+
+#     my $str = "";
+#     foreach my $p ( @$pkgs ) {
+# 	my $p_pkg = $env->{db}->get_pkg( $p );
+
+# 	if ( $p_pkg ) {
+# 	    if ($p_pkg->is_virtual) {
+# 		$str .= "<dt><a href=\"../virtual/$p\">$p</a></dt>\n".
+# 		    "\t<dd>".gettext("Virtual package")."</dd>\n";
+# 	    } else {
+# 		my %subsections = $p_pkg->get_arch_fields( 'section',
+# 							   $env->{archs} );
+# 		my $subsection = $subsections{max_unique};
+# 		my %desc_md5s = $p_pkg->get_arch_fields( 'description-md5', 
+# 							 $env->{archs} );
+# 		my $short_desc = conv_desc( $lang,
+# 					    encode_entities( $env->{db}->get_short_desc( $desc_md5s{max_unique}, $lang ), "<>&\"" ) );
+# 		$str .= "<dt><a href=\"../$subsection/$p\">$p</a></dt>\n".
+# 		    "\t<dd>$short_desc</dd>\n";
+# 	    }
+# 	} else {
+# 	    $str .= "<dt>$p</dt>\n\t<dd>".gettext("Not available")."</dd>\n";
+# 	}
+#     }
+#     if ($str) {
+# 	$str = "<dl>$str</dl>\n";
+#     }
+
+#     return $str;
+# }
 
 sub pmoreinfo {
     my %info = @_;
     
     my $name = $info{name} or return;
     my $env = $info{env} or return;
-    my $d = $info{data} or return;
+    my $opts = $info{opts} or return;
+    my $page = $info{data} or return;
     my $is_source = $info{is_source};
 
     my $str = "<div id=\"pmoreinfo\">";
@@ -144,25 +132,32 @@ sub pmoreinfo {
 			 $bug_url.$name, $name );
     }
 	
+    my $source = $page->get_src( 'name' );
+    my $source_version = $page->get_src( 'version' );
+    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/$d->{src_name}\">$d->{src_name}</a>, ".
+	$str .= " <a href=\"/$path/source/$source\">$source</a>, ".
 	    gettext( "Download" ).":\n";
 
-	unless ($d->{src_files}) {
+	unless (@$files) {
 	    $str .= gettext( "Not found" );
 	} else {
-	    foreach( @{$d->{src_files}} ) {
+	    foreach( @$files ) {
 		my ($src_file_md5, $src_file_size, $src_file_name) = @$_;
-		if ($d->{is_security}) {
-		    $str .= "<a href=\"$env->{opts}{security_site}/$d->{src_directory}/$src_file_name\">[";
-		} elsif ($d->{is_volatile}) {
-		    $str .= "<a href=\"$env->{opts}{volatile_site}/$d->{src_directory}/$src_file_name\">[";
-		} elsif ($d->{is_nonus}) {
-		    $str .= "<a href=\"$env->{opts}{nonus_site}/$d->{src_directory}/$src_file_name\">[";
-		} else {
-		    $str .= "<a href=\"$env->{opts}{debian_site}/$d->{src_directory}/$src_file_name\">[";
-		}
+		for ($page->get_newest('archive')) {
+		    /security/o && do {
+			$str .= "<a href=\"$env->{security}/$src_dir/$src_file_name\">["; last };
+		    /volatile/o && do {
+			$str .= "<a href=\"$env->{volatile}/$src_dir/$src_file_name\">["; last };
+		    /non-us/io && do {
+			$str .= "<a href=\"$env->{nonus_site}/$src_dir/$src_file_name\">["; last };
+ 		    $str .= "<a href=\"$env->{us}/$src_dir/$src_file_name\">[";
+ 		}
 		if ($src_file_name =~ /dsc$/) {
 		    $str .= "dsc";
 		} else {
@@ -176,10 +171,9 @@ sub pmoreinfo {
     }
 
     if ($info{changesandcopy}) {
-	if ( $d->{src_directory} ) {
-	    my $src_dir = $d->{src_directory};
-	    (my $src_basename = $d->{src_version}) =~ s,^\d+:,,; # strip epoche
-	    $src_basename = "$d->{src_name}_$src_basename";
+	if ( $src_dir ) {
+	    (my $src_basename = $source_version) =~ s,^\d+:,,; # strip epoche
+	    $src_basename = "${source}_$src_basename";
 	    $src_dir =~ s,pool/updates,pool,o;
 	    $src_dir =~ s,pool/non-US,pool,o;
 	    $str .= "<br>".sprintf( gettext( "View the <a href=\"%s\">Debian changelog</a>" ),
@@ -190,10 +184,10 @@ sub pmoreinfo {
 	    $str .= sprintf( gettext( "View the <a href=\"%s\">copyright file</a>" ),
 			     $copyright_url )."</p>";
 	}
-    }
+   }
 
     if ($info{maintainers}) {
-	my @uploaders = @{$d->{uploaders}};
+	my @uploaders = @{$page->get_src( 'uploaders' )};
 	foreach (@uploaders) {
 	    $_->[0] = encode_entities( $_->[0], '&<>' );
 	}
@@ -215,7 +209,7 @@ sub pmoreinfo {
 	    $str .= "<p>\n$up_str ";
 	}
 
-	$str .= sprintf( gettext( "See the <a href=\"%s\">developer information for %s</a>." )."</p>", $QA_URL.$d->{src_name}, $name );
+	$str .= sprintf( gettext( "See the <a href=\"%s\">developer information for %s</a>." )."</p>", $QA_URL.$source, $name );
     }
 
     if ($info{search}) {
@@ -228,6 +222,155 @@ sub pmoreinfo {
     return $str;
 }
 
+sub dep_item {
+    my ( $link, $name, $info, $desc ) = @_;
+    my $post_link = '';
+    if ($link) {
+	$link = "<a href=\"$link\">";
+	$post_link = '</a>';
+    } else {
+	$link = '';
+    }
+    if ($info) {
+	$info = " $info";
+    } else {
+	$info = '';
+    }
+    if ($desc) {
+	$desc = "</dt><dd>$desc</dd>";
+    } else {
+	$desc = '</dt>';
+    }
+
+    return "$link$name$post_link$info$desc";
+} # end dep_item
+
+sub print_deps {
+    my ( $packages, $opts, $pkg, $relations, $type) = @_;
+    my %dep_type = ('depends' => 'dep', 'recommends' => 'rec', 
+		    'suggests' => 'sug');
+    my $res = "<ul class=\"ul$dep_type{$type}\">\n";
+    my $first = 1;
+
+#    use Data::Dumper;
+#    debug( "print_deps called:\n".Dumper( $pkg, $relations, \$type ), 3 );
+
+    foreach my $rel (@$relations) {
+	my $is_old_pkgs = $rel->[0];
+	my @res_pkgs = ();
+
+	if ($is_old_pkgs)  {
+	    $res .= "<dt>";
+	} else {
+	    if ($first) {
+		$res .= "<li>";
+		$first = 0;
+	    } else {
+		$res .= "</dl></li>\n<li>";
+	    }
+	    $res .= "<dl><dt><img class=\"hidecss\" src=\"../../Pics/$dep_type{$type}.gif\" alt=\"[$dep_type{$type}]\"> ";
+	}
+
+	foreach my $rel_alt ( @$rel ) {
+	    next unless ref($rel_alt);
+	    my ( $p_name, $pkg_version, $arch_neg,
+		 $arch_str, $subsection, $available ) = @$rel_alt;
+
+	    if ($arch_str) {
+		if ($arch_neg) {
+		    $arch_str = " [".gettext("not")." $arch_str]";
+		} else {
+		    $arch_str = " [$arch_str]";
+		}
+	    }
+	    $pkg_version = "($pkg_version)" if $pkg_version;
+	    
+	    my @results;
+	    my %short_descs;
+	    my $short_desc = $short_descs{$p_name} ||
+		(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",
+					      $p_name, "$pkg_version$arch_str" );
+		} else {
+		    $short_descs{$p_name} ||= $short_desc;
+		    $short_desc = encode_entities( $short_desc, "<>&\"" );
+		    push @res_pkgs, dep_item( "/$opts->{suite}/$p_name",
+					      $p_name, "$pkg_version$arch_str", $short_desc );
+		}
+	    } elsif ( $is_old_pkgs ) {
+		push @res_pkgs, dep_item( undef, $p_name, "$pkg_version$arch_str" );
+	    } else {
+		my $short_desc = gettext( "Package not available" );
+		push @res_pkgs, dep_item( undef, $p_name, "$pkg_version$arch_str", $short_desc );
+	    }
+	    
+	}
+	
+	$res .= "\n".join( "<dt>".gettext( "or" )." ", @res_pkgs )."\n";
+    }
+    if (@$relations) {
+	$res .= "</dl></li>\n";
+	$res .= "</ul>\n";
+    } else {
+	$res = "";
+    }
+    return $res;
+} # end print_deps
+
+# sub print_src_deps {
+#     my ( $env, $lang, $pkg, $version, $type) = @_;
+#     my %dep_type = ('build-depends' => 'adep', 'build-depends-indep' => 'idep' );
+#     my $found = 0;
+#     my $res = "<ul class=\"ul$dep_type{$type}\">\n";
+#     foreach my $dep ( @{$pkg->{versions}{$version}{$type}} ) {
+#         $found = 1;
+# 	my @res_pkgs;
+# 	$res .= "<li><dl><dt><img class=\"hidecss\" src=\"../../Pics/$dep_type{$type}.gif\" alt=\"[$dep_type{$type}]\"> ";
+# 	foreach my $or_dep ( @$dep ) {
+# 	    my $p_name = $or_dep->[0];
+# 	    my $p = $env->{db}->get_pkg( $p_name );
+# 	    my $p_version = $or_dep->[1] ? "(".encode_entities( $or_dep->[1] ).
+# 		" $or_dep->[2]) " : "";
+# 	    my $not = gettext( "not" );
+# 	    if ($or_dep->[3]) {
+# 		$or_dep->[3] =~ s/\s+/, /go;
+# 		# as either all or no archs have to be prepended with
+# 		# exlamation marks, convert the first and delete the others
+# 		$or_dep->[3] =~ s/!\s*/$not /o;
+# 		$or_dep->[3] =~ s/!\s*//go;
+# 	    }
+# 	    my $arch_str = $or_dep->[3] ? " [$or_dep->[3]]" : "";
+# 	    if ( $p ) {
+# 		if ( $p->is_virtual ) {
+# 		    my $short_desc = gettext( "Virtual package" );
+# 		    push @res_pkgs, dep_item( "../virtual/$p_name", $p_name, "$p_version$arch_str", $short_desc );
+# 		} else {
+# 		    my %sections = $p->get_arch_fields( 'section',
+# 							$env->{archs} );
+# 		    my $section = $sections{max_unique};
+# 		    my %desc_md5s = $p->get_arch_fields( 'description-md5', 
+# 							 $env->{archs} );
+# 		    my $short_desc = conv_desc( $lang, encode_entities( $env->{db}->get_short_desc( $desc_md5s{max_unique}, $lang ), "<>&\"" ) );
+# 		    push @res_pkgs, dep_item( "../$section/$p_name", $p_name, "$p_version$arch_str", $short_desc );
+# 		}
+# 	    } else {
+# 		my $short_desc = gettext( "Package not available" );
+# 		push @res_pkgs, dep_item( undef, $p_name, "$p_version$arch_str", $short_desc );
+# 	    }
+# 	}
+# 	$res .= "\n".join( "<dt>\n".gettext( "or" )." ", @res_pkgs )."</dl></li>\n";
+#     }
+#     if ($found) {
+#         $res .= "\n</ul>";
+#     } else {
+#         $res = "";
+#     }
+#     return $res;
+# } # end print_src_deps
+
+
 my $ds_begin = '<dl>';
 my $ds_item_desc  = '<dt>';
 my $ds_item = ':</dt><dd>';