X-Git-Url: https://git.deb.at/?p=deb%2Fpackages.git;a=blobdiff_plain;f=lib%2FPackages%2FHTML.pm;h=826461a0e944cb035a3a074c44802fd6373116a0;hp=735302e5f6931681b1fe3d26011b042d0da2318e;hb=5ca21f1ba07a6b559395bec8d6bc1e528eb238d1;hpb=355e7c2b45892eed587f21d9f1185dade88e8b0a diff --git a/lib/Packages/HTML.pm b/lib/Packages/HTML.pm index 735302e..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,24 +24,9 @@ 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 ); - -our $HOME = "http://www.debian.org"; -our $CONTACT_MAIL = 'debian-www@lists.debian.org'; -our $WEBMASTER_MAIL = 'webmaster@debian.org'; -our $SEARCH_PAGE = "http://packages.debian.org/"; -our $CGI_ROOT = "http://packages.debian.org/cgi-bin"; -our $CN_HELP_URL = "${HOME}/intro/cn"; -our $CHANGELOG_URL = '/changelogs'; -our $COPYRIGHT_URL = '/changelogs'; -our $SEARCH_URL = '/cgi-bin/search_packages.pl?searchon=names&version=all&exact=1&keywords='; -our $SRC_SEARCH_URL = '/cgi-bin/search_packages.pl?searchon=sourcenames&version=all&exact=1&keywords='; -our $BUG_URL = 'http://bugs.debian.org/'; -our $SRC_BUG_URL = 'http://bugs.debian.org/src:'; -our $QA_URL = 'http://packages.qa.debian.org/'; + pdeplegend pkg_list pmoreinfo print_deps ); - -my %img_trans = ( pt_BR => "pt", pt_PT => "pt", sv_SE => "sv" ); +our $CHANGELOG_URL = '/changelogs'; sub img { my ( $root, $url, $src, $alt, %attr ) = @_; @@ -66,19 +55,6 @@ sub marker { return "[$_[0]]"; } -sub note { - my ( $title, $note ) = @_; - my $str = ""; - - if ($note) { - $str .= "

$title

"; - } else { - $note = $title; - } - $str .= "

$note

"; - return $str; -} - sub pdesc { my ( $short_desc, $long_desc ) = @_; my $str = ""; @@ -103,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 .= "
$p
\n". - "\t
".gettext("Virtual package")."
\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 .= "
$p
\n". - "\t
$short_desc
\n"; - } - } else { - $str .= "
$p
\n\t
".gettext("Not available")."
\n"; - } - } - if ($str) { - $str = "
$str
\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 .= "
$p
\n". +# "\t
".gettext("Virtual package")."
\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 .= "
$p
\n". +# "\t
$short_desc
\n"; +# } +# } else { +# $str .= "
$p
\n\t
".gettext("Not available")."
\n"; +# } +# } +# if ($str) { +# $str = "
$str
\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 = "
"; @@ -155,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 .= " {src_name}\">$d->{src_name}, ". + $str .= " $source, ". 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 .= "{opts}{security_site}/$d->{src_directory}/$src_file_name\">["; - } elsif ($d->{is_volatile}) { - $str .= "{opts}{volatile_site}/$d->{src_directory}/$src_file_name\">["; - } elsif ($d->{is_nonus}) { - $str .= "{opts}{nonus_site}/$d->{src_directory}/$src_file_name\">["; - } else { - $str .= "{opts}{debian_site}/$d->{src_directory}/$src_file_name\">["; - } + for ($page->get_newest('archive')) { + /security/o && do { + $str .= "{security}/$src_dir/$src_file_name\">["; last }; + /volatile/o && do { + $str .= "{volatile}/$src_dir/$src_file_name\">["; last }; + /non-us/io && do { + $str .= "{nonus_site}/$src_dir/$src_file_name\">["; last }; + $str .= "{us}/$src_dir/$src_file_name\">["; + } if ($src_file_name =~ /dsc$/) { $str .= "dsc"; } else { @@ -187,24 +171,23 @@ 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 .= "
".sprintf( gettext( "View the Debian changelog" ), "$CHANGELOG_URL/$src_dir/$src_basename/changelog" )."
\n"; - my $copyright_url = "$COPYRIGHT_URL/$src_dir/$src_basename/"; + my $copyright_url = "$CHANGELOG_URL/$src_dir/$src_basename/"; $copyright_url .= ( $is_source ? 'copyright' : "$name.copyright" ); $str .= sprintf( gettext( "View the copyright file" ), $copyright_url )."

"; } - } + } if ($info{maintainers}) { - my @uploaders = @{$d->{uploaders}}; + my @uploaders = @{$page->get_src( 'uploaders' )}; foreach (@uploaders) { $_->[0] = encode_entities( $_->[0], '&<>' ); } @@ -226,7 +209,7 @@ sub pmoreinfo { $str .= "

\n$up_str "; } - $str .= sprintf( gettext( "See the developer information for %s." )."

", $QA_URL.$d->{src_name}, $name ); + $str .= sprintf( gettext( "See the developer information for %s." )."

", $QA_URL.$source, $name ); } if ($info{search}) { @@ -239,6 +222,155 @@ sub pmoreinfo { return $str; } +sub dep_item { + my ( $link, $name, $info, $desc ) = @_; + my $post_link = ''; + if ($link) { + $link = ""; + $post_link = ''; + } else { + $link = ''; + } + if ($info) { + $info = " $info"; + } else { + $info = ''; + } + if ($desc) { + $desc = "
$desc
"; + } else { + $desc = ''; + } + + 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 = "\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 = ""; +# } else { +# $res = ""; +# } +# return $res; +# } # end print_src_deps + + my $ds_begin = '
'; my $ds_item_desc = '
'; my $ds_item = ':
'; @@ -292,8 +424,9 @@ sub header { sourcenames => "", ); $checked_searchon{$values{searchon}} = "checked=\"checked\""; $search_in_header = < +
+ @@ -325,8 +458,9 @@ MENU filelist => "", ); $checked_searchmode{$values{searchmode}} = "checked=\"checked\""; $search_in_header = < +
+ @@ -355,7 +489,6 @@ MENU my $KEYWORDS_LINE = ""; my $LANG = $params{lang}; - my $img_lang = $img_trans{$LANG} || $LANG; my $charset = get_charset($LANG); my $txt = <