use strict;
use warnings;
+use Exporter;
use URI::Escape;
use HTML::Entities;
+use Locale::gettext;
-use Packages::CGI;
+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;
-#use Packages::I18N::LanguageNames;
+use Packages::I18N::Locale;
+use Packages::I18N::Languages;
+use Packages::I18N::LanguageNames;
#use Generated::Strings qw( gettext dgettext );
-# dummy routines
-sub get_charset { return "utf-8" };
-sub gettext { return $_[0]; };
-
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
+ ds_begin ds_item ds_end title marker pdesc
pdeplegend pkg_list pmoreinfo print_deps print_src_deps );
our $CHANGELOG_URL = '/changelogs';
}
sub marker {
- return "[<span class=\"pred\">$_[0]</span>]";
+ return "[<strong class=\"pmarker\">$_[0]</strong>]";
}
sub pdesc {
}
sub pdeplegend {
- my $str = "<table border=\"1\" summary=\"legend\"><tr>\n";
+ my $str = "<table id=\"pdeplegend\" summary=\"legend\"><tr>\n";
foreach my $entry (@_) {
$str .= "<td><img src=\"$ROOT/Pics/$entry->[0].gif\" alt=\"[$entry->[0]]\" width=\"16\" height=\"16\">= $entry->[1]</td>";
sub pkg_list {
my ( $packages, $opts, $pkgs, $lang ) = @_;
+ my $suite = $opts->{suite}[0];
my $str = "";
foreach my $p ( @$pkgs ) {
- my $short_desc = (read_entry_simple( $packages, $p, $opts->{h_archives}, $opts->{suite}))->[-1];
+ my $short_desc = (read_entry_simple( $packages, $p, $opts->{h_archives}, $suite))->[-1];
if ( $short_desc ) {
- $str .= "<dt><a href=\"$ROOT/$opts->{suite}/$p\">$p</a></dt>\n".
+ $str .= "<dt><a href=\"$ROOT/$suite/$p\">$p</a></dt>\n".
"\t<dd>$short_desc</dd>\n";
} else {
- $str .= "<dt>$p</dt>\n\t<dd>".gettext("Not available")."</dd>\n";
+ $str .= "<dt>$p</dt>\n\t<dd>"._g("Not available")."</dd>\n";
}
}
if ($str) {
my $opts = $info{opts} or return;
my $page = $info{data} or return;
my $is_source = $info{is_source};
+ my $suite = $opts->{suite}[0];
my $str = "<div id=\"pmoreinfo\">";
- $str .= sprintf( "<h2>".gettext( "More Information on %s" )."</h2>",
+ $str .= sprintf( "<h2>"._g( "More Information on %s" )."</h2>",
$name );
if ($info{bugreports}) {
my $bug_url = $is_source ? $SRC_BUG_URL : $BUG_URL;
- $str .= "<p>\n".sprintf(
gettext( "Check for <a href=\"%s\">Bug Reports</a> about %s." )."<br>\n",
+ $str .= "<p>\n".sprintf(
_g( "Check for <a href=\"%s\">Bug Reports</a> about %s." )."<br>\n",
$bug_url.$name, $name );
}
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=\"/$path/source/$source\">$source</a>, ".
- gettext( "Download" ).":\n";
+ $suite :
+ "$suite/$opts->{archive}[0]";
+ $str .= _g( "Source Package:" );
+ $str .= " <a href=\"$ROOT/$path/source/$source\">$source</a>, ".
+ _g( "Download" ).":\n";
unless (defined($files) and @$files) {
- $str .= gettext( "Not found" );
+ $str .= _g( "Not found" );
} else {
foreach( @$files ) {
- my ($src_file_md5, $src_file_size, $src_file_name) = @$_;
+ my ($src_file_md5, $src_file_size, $src_file_name) = split /\s/o, $_;
for ($page->get_newest('archive')) {
/security/o && do {
$str .= "<a href=\"$env->{security}/$src_dir/$src_file_name\">["; last };
$str .= "]</a>\n";
}
}
-# $package_page .= sprintf( gettext( " (These sources are for version %s)\n" ), $src_version )
+# $package_page .= sprintf( _g( " (These sources are for version %s)\n" ), $src_version )
# if ($src_version ne $version) && !$src_version_given_in_control;
}
$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>" ),
+ $str .= "<br>".sprintf( _g( 'View the <a href="%s">Debian changelog</a>' ),
"$CHANGELOG_URL/$src_dir/$src_basename/changelog" )."<br>\n";
my $copyright_url = "$CHANGELOG_URL/$src_dir/$src_basename/";
$copyright_url .= ( $is_source ? 'copyright' : "$name.copyright" );
- $str .= sprintf( gettext( "View the <a href=\"%s\">copyright file</a>" ),
+ $str .= sprintf( _g( 'View the <a href="%s">copyright file</a>' ),
$copyright_url )."</p>";
}
}
}
my ($maint_name, $maint_mail) = @{shift @$uploaders};
unless (@$uploaders) {
- $str .= "<p>\n".sprintf( gettext( "%s is responsible for this Debian package." ).
+ $str .= "<p>\n".sprintf( _g( "%s is responsible for this Debian package." ).
"\n",
"<a href=\"mailto:$maint_mail\">$maint_name</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 );
+ $up_str .= sprintf( _g( " 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 ) if $source;
+ $str .= sprintf(
_g( "See the <a href=\"%s\">developer information for %s</a>." )."</p>", $QA_URL.$source, $name ) if $source;
}
if ($info{search}) {
my $encodedname = uri_escape( $name );
- my $search_url = $is_source ? $SRC_SEARCH_URL : $SEARCH_URL;
- $str .= "<p>".sprintf( gettext( "Search for <a href=\"%s\">other versions of %s</a>" ), $search_url.$encodedname, $name )."</p>\n";
+ my $search_url = $is_source ? "$ROOT/source" : $ROOT;
+ $str .= "<p>".sprintf( _g( "Search for <a href=\"%s\">other versions of %s</a>" ),
+ "$search_url/$encodedname", $name )."</p>\n";
}
$str .= "</div> <!-- end pmoreinfo -->\n";
sub print_deps {
my ( $packages, $opts, $pkg, $relations, $type) = @_;
my %dep_type = ('depends' => 'dep', 'recommends' => 'rec',
- 'suggests' => 'sug');
+ 'suggests' => 'sug', 'build-depends' => 'adep',
+ 'build-depends-indep' => 'idep' );
my $res = "<ul class=\"ul$dep_type{$type}\">\n";
my $first = 1;
+ my $suite = $opts->{suite}[0];
+ my $one_archive = @{$opts->{archive}} > 1 ? '': $opts->{archive}[0];
# use Data::Dumper;
# debug( "print_deps called:\n".Dumper( $pkg, $relations, \$type ), 3 );
my ( $p_name, $pkg_version, $arch_neg,
$arch_str, $subsection, $available ) = @$rel_alt;
- if ($arch_str) {
+ if ($arch_str ||= '') {
if ($arch_neg) {
- $arch_str = " [".gettext("not")." $arch_str]";
+ $arch_str = " ["._g("not")." $arch_str]";
} else {
$arch_str = " [$arch_str]";
}
}
- $pkg_version = "($pkg_version)" if $pkg_version;
+ $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];
+ my %entries;
+ my $entry = $entries{$p_name} ||
+ read_entry_simple( $packages, $p_name, $opts->{h_archives}, $suite);
+ my $short_desc = $entry->[-1];
+ my $arch = $entry->[2];
+ my $archive = $entry->[0];
if ( $short_desc ) {
+ my $path = $one_archive eq $archive ? "$suite/$archive" :
+ $suite;
if ( $is_old_pkgs ) {
- push @res_pkgs, dep_item( "/$opts->{suite}/$p_name",
+ push @res_pkgs, dep_item( "$ROOT/$path/$p_name",
$p_name, "$pkg_version$arch_str" );
+ } elsif ($arch eq 'virtual') {
+ my @provided_by = split /\s/, $short_desc;
+ $short_desc = "virtual package provided by ";
+ if (@provided_by < 10) {
+ $short_desc .= join( ', ',map { "<a href=\"$ROOT/$path/$_\">$_</a>" } @provided_by);
+ } else {
+ $short_desc .= scalar(@provided_by)." packages";
+ }
+ push @res_pkgs, dep_item( "$ROOT/$path/$p_name",
+ $p_name, "$pkg_version$arch_str", $short_desc );
} else {
- $short_descs{$p_name} ||= $short_desc;
+ $entries{$p_name} ||= $entry;
$short_desc = encode_entities( $short_desc, "<>&\"" );
- push @res_pkgs, dep_item( "/$opts->{suite}/$p_name",
+ push @res_pkgs, dep_item( "$ROOT/$path/$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" );
+ my $short_desc = _g( "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";
+ $res .= "\n".join( "<dt>"._g( "or" )." ", @res_pkgs )."\n";
}
if (@$relations) {
$res .= "</dl></li>\n";
return $res;
} # end print_deps
-sub print_src_deps {
- my ( $packages, $opts, $pkg, $relations, $type) = @_;
- my %dep_type = ('build-depends' => 'adep', 'build-depends-indep' => 'idep' );
- my $res = "<ul class=\"ul$dep_type{$type}\">\n";
- foreach my $dep (@$relations) {
- my @res_pkgs;
- $res .= "<li><dl><dt><img class=\"hidecss\" src=\"$ROOT/Pics/$dep_type{$type}.gif\" alt=\"[$dep_type{$type}]\"> ";
- foreach my $or_dep ( @$dep ) {
- my $p_name = $or_dep->[0];
- my $p_version = $or_dep->[1] ? "(".encode_entities( $or_dep->[1] ).
- " $or_dep->[2]) " : "";
- my $not = gettext( "not" );
- my $arch_str = '';
- if ($or_dep->[3] && @{$or_dep->[3]}) {
- # as either all or no archs have to be prepended with
- # exlamation marks, convert the first and delete the others
- if ($or_dep->[3][0] =~ /^!/) {
- $arch_str = "$not ";
- foreach (@{$or_dep->[3]}) {
- $_ =~ s/^!//go;
- }
- }
- $arch_str = " [${arch_str}@{$or_dep->[3]}]";
- }
- my $short_desc = (read_entry_simple( $packages, $p_name, $opts->{h_archives}, $opts->{suite}))->[-1];
- if ( $short_desc ) {
- $short_desc = encode_entities( $short_desc, "<>&\"" );
- push @res_pkgs, dep_item( "/$opts->{suite}/$p_name", $p_name, "$p_version$arch_str", $short_desc );
- } else {
- $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 (@$relations) {
- $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>';
my $page_title = $params{page_title} || $params{title} || '';
my $meta = $params{meta} || '';
- if ($params{print_title_above}) {
- $title_in_header = "<h1>$title_in_header</h1>";
- } else {
- $title_in_header = '';
- }
-
my $search_in_header = '';
$params{print_search_field} ||= "";
if ($params{print_search_field} eq 'packages') {
my %values = %{$params{search_field_values}};
my %checked_searchon = ( names => "",
all => "",
- sourcenames => "", );
+ sourcenames => "",
+ contents => "");
$checked_searchon{$values{searchon}} = "checked=\"checked\"";
+ $checked_searchon{names} = "checked=\"checked\""
+ if $values{searchon} eq 'default';
$search_in_header = <<MENU;
-<form method="GET" action="$SEARCH_CGI">
+<form method="GET" action="$SEARCH_URL">
<div id="hpacketsearch">
<input type="hidden" name="debug" value="$values{debug}">
<input type="hidden" name="suite" value="$values{suite}">
-<input type="hidden" name="subword" value="$values{subword}">
<input type="hidden" name="exact" value="$values{exact}">
<input type="hidden" name="arch" value="$values{arch}">
<input type="hidden" name="section" value="$values{section}">
-<input type="hidden" name="case" value="$values{case}">
<input type="text" size="30" name="keywords" value="$values{keywords}" id="kw">
-<input type="submit" value="Search">
-<span style="font-size: 60%"><a href="$SEARCH_PAGE#search_packages">Full options</a></span>
+<input type="submit" value="%s">
+<span style="font-size: 60%%"><a href="$SEARCH_PAGE#search_packages">%s</a></span>
<br>
-<div style="font-size: 80%">Search on:
+<div style="font-size: 80%%">%s
<input type="radio" name="searchon" value="names" id="onlynames" $checked_searchon{names}>
-<label for="onlynames">Package names only</label>
+<label for="onlynames">%s</label>
<input type="radio" name="searchon" value="all" id="descs" $checked_searchon{all}>
-<label for="descs">Descriptions</label>
+<label for="descs">%s</label>
<br>
<input type="radio" name="searchon" value="sourcenames" id="src" $checked_searchon{sourcenames}>
-<label for="src">Source package names</label>
-</div>
-</div> <!-- end hpacketsearch -->
-</form>
-MENU
-;
- } elsif ($params{print_search_field} eq 'contents') {
- my %values = %{$params{search_field_values}};
- my %checked_searchmode = ( searchfiles => "",
- searchfilesanddirs => "",
- searchword => "",
- filelist => "", );
- $checked_searchmode{$values{searchmode}} = "checked=\"checked\"";
- $search_in_header = <<MENU;
-<form method="GET" action="$CONTENTS_SEARCH_CGI">
-<div id="hpacketsearch">
-<input type="hidden" name="debug" value="$values{debug}" />
-<input type="hidden" name="version" value="$values{version}" />
-<input type="hidden" name="arch" value="$values{arch}" />
-<input type="hidden" name="case" value="$values{case}" />
-<input type="text" size="30" name="word" id="keyword" value="$values{keyword}">
-<input type="submit" value="Search">
-<span style="font-size: 60%"><a href="$SEARCH_PAGE#search_contents">Full options</a></span>
-<br>
-<div style="font-size: 80%">Display:
-<input type=radio name="searchmode" value="searchfiles" id="searchfiles" $checked_searchmode{searchfiles}>
-<label for="searchfiles">files</label>
-<input type=radio name="searchmode" value="searchfilesanddirs" id="searchfilesanddirs" $checked_searchmode{searchfilesanddirs}>
-<label for="searchfilesanddirs">files & directories</label>
-<br>
-<input type=radio name="searchmode" value="searchword" id="searchword" $checked_searchmode{searchword}>
-<label for="searchword">subword matching</label>
-<input type=radio name="searchmode" value="filelist" id="filelist" $checked_searchmode{filelist}>
-<label for="filelist">content list</label>
+<label for="src">%s</label>
+<input type="radio" name="searchon" value="contents" id="conts" $checked_searchon{contents}>
+<label for="conts">%s</label>
</div>
</div> <!-- end hpacketsearch -->
</form>
MENU
;
+ $search_in_header = sprintf( $search_in_header,
+ _g( 'Search' ),
+ _g( 'Full options' ),
+ _g( 'Search on:'),
+ _g( 'Package Names' ),
+ _g( 'Descriptions' ),
+ _g( 'Source package names' ),
+ _g( 'Package contents' ));
+# } elsif ($params{print_search_field} eq 'contents') {
+# my %values = %{$params{search_field_values}};
+# my %checked_searchmode = ( searchfiles => "",
+# searchfilesanddirs => "",
+# searchword => "",
+# filelist => "", );
+# $checked_searchmode{$values{searchmode}} = "checked=\"checked\"";
+# $search_in_header = <<MENU;
+# <form method="GET" action="$CONTENTS_SEARCH_CGI">
+# <div id="hpacketsearch">
+# <input type="hidden" name="debug" value="$values{debug}" />
+# <input type="hidden" name="version" value="$values{version}" />
+# <input type="hidden" name="arch" value="$values{arch}" />
+# <input type="hidden" name="case" value="$values{case}" />
+# <input type="text" size="30" name="word" id="keyword" value="$values{keyword}">
+# <input type="submit" value="Search">
+# <span style="font-size: 60%"><a href="$SEARCH_PAGE#search_contents">Full options</a></span>
+# <br>
+# <div style="font-size: 80%">Display:
+# <input type=radio name="searchmode" value="searchfiles" id="searchfiles" $checked_searchmode{searchfiles}>
+# <label for="searchfiles">files</label>
+# <input type=radio name="searchmode" value="searchfilesanddirs" id="searchfilesanddirs" $checked_searchmode{searchfilesanddirs}>
+# <label for="searchfilesanddirs">files & directories</label>
+# <br>
+# <input type=radio name="searchmode" value="searchword" id="searchword" $checked_searchmode{searchword}>
+# <label for="searchword">subword matching</label>
+# <input type=radio name="searchmode" value="filelist" id="filelist" $checked_searchmode{filelist}>
+# <label for="filelist">content list</label>
+# </div>
+# </div> <!-- end hpacketsearch -->
+# </form>
+# MENU
+# ;
}
my $keywords = $params{keywords} || '';
$DESC_LINE
$meta
<link href="$ROOT/debian.css" rel="stylesheet" type="text/css" media="all">
+<link href="$ROOT/packages.css" rel="stylesheet" type="text/css" media="all">
</head>
<body>
<div id="header">
HEAD
;
- $txt .= img( "$HOME/", "", "Pics/debian.png", gettext( "Debian Project" ),
+ $txt .= img( "$HOME/", "", "Pics/debian.png", _g( "Debian Project" ),
width => 179, height => 61 );
$txt .= <<HEADEND;
NAVBEGIN
;
-# $title_in_header
- $txt .= "<p class=\"hidecss\"><a href=\"\#inner\">" . gettext("Skip Site Navigation")."</a></p>\n";
+ $txt .= "<p class=\"hidecss\"><a href=\"\#inner\">" . _g("Skip Site Navigation")."</a></p>\n";
$txt .= "<div id=\"navbar\">\n<ul>".
- "<li><a href=\"$HOME/intro/about\">".gettext( "About Debian" )."</a></li>\n".
- "<li><a href=\"$HOME/News/\">".gettext( "News" )."</a></li>\n".
- "<li><a href=\"$HOME/distrib/\">".gettext( "Getting Debian" )."</a></li>\n".
- "<li><a href=\"$HOME/support\">".gettext( "Support" )."</a></li>\n".
- "<li><a href=\"$HOME/devel/\">".gettext( "Development" )."</a></li>\n".
- "<li><a href=\"$HOME/sitemap\">".gettext( "Site map" )."</a></li>\n".
- "<li><a href=\"http://search.debian.org/\">".gettext( "Search" )."</a></li>\n";
+ "<li><a href=\"$HOME/intro/about\">"._g( "About Debian" )."</a></li>\n".
+ "<li><a href=\"$HOME/News/\">"._g( "News" )."</a></li>\n".
+ "<li><a href=\"$HOME/distrib/\">"._g( "Getting Debian" )."</a></li>\n".
+ "<li><a href=\"$HOME/support\">"._g( "Support" )."</a></li>\n".
+ "<li><a href=\"$HOME/devel/\">"._g( "Development" )."</a></li>\n".
+ "<li><a href=\"$HOME/sitemap\">"._g( "Site map" )."</a></li>\n".
+ "<li><a href=\"http://search.debian.org/\">"._g( "Search" )."</a></li>\n";
$txt .= "</ul>\n";
$txt .= <<ENDNAV;
</div> <!-- end navbar -->
BEGINCONTENT
;
- if ($params{print_title_above}) {
- $txt .= "<h1>$page_title</h1>\n";
- }
- if ($params{print_title_below}) {
+ if ($params{print_title}) {
$txt .= "<h1>$page_title</h1>\n";
}
$langs.
"\n<hr class=\"hidecss\">\n" .
"<p$bl_class>".
- sprintf(
gettext( "Back to: <a href=\"%s/\">Debian Project homepage</a> || <a href=\"%s/\">Packages search page</a>" ), $HOME, $ROOT ).
+ sprintf(
_g( "Back to: <a href=\"%s/\">Debian Project homepage</a> || <a href=\"%s/\">Packages search page</a>" ), $HOME, $ROOT ).
"</p>\n<hr class=\"hidecss\">\n".
"<div id=\"fineprint\" class=\"bordertop\"><p>".
- sprintf(
gettext( "To report a problem with the web site, e-mail <a href=\"mailto:%s\">%s</a>. For other contact information, see the Debian <a href=\"%s/contact\">contact page</a>." ), $CONTACT_MAIL, $CONTACT_MAIL, $HOME).
+ sprintf(
_g( "To report a problem with the web site, e-mail <a href=\"mailto:%s\">%s</a>. For other contact information, see the Debian <a href=\"%s/contact\">contact page</a>." ), $CONTACT_MAIL, $CONTACT_MAIL, $HOME).
"</p>\n".
- "<p>". gettext( "Last Modified: " ). "LAST_MODIFIED_DATE".
+ "<p>". _g( "Last Modified: " ). "LAST_MODIFIED_DATE".
"<br>\n".
- sprintf(
gettext( "Copyright © 1997-2005 <a href=\"http://www.spi-inc.org\">SPI</a>; See <a href=\"%s/license\">license terms</a>." ), "$HOME/" )."<br>\n".
- gettext( "Debian is a registered trademark of Software in the Public Interest, Inc." ).
+ sprintf(
_g( "Copyright © 1997-2005 <a href=\"http://www.spi-inc.org\">SPI</a>; See <a href=\"%s/license\">license terms</a>." ), "$HOME/" )."<br>\n".
+ _g( "Debian is a registered trademark of Software in the Public Interest, Inc." ).
"</div> <!-- end fineprint -->\n".
"</div> <!-- end footer -->\n".
"</div> <!-- end outer -->\n".
if (@used_langs) {
$str .= "<hr class=\"hidecss\">\n";
$str .= "<!--UdmComment-->\n<p>\n";
- $str .= gettext( "This page is also available in the following languages:\n" );
+ $str .= _g( "This page is also available in the following languages:\n" );
$str .= "</p><p class=\"navpara\">\n";
my @printed_langs = ();
$str .= "</a>\n";
}
$str .= "\n</p><p>\n";
- $str .= sprintf( gettext( "How to set <a href=\"%s\">the default document language</a></p>" ), $CN_HELP_URL );
+ $str .= sprintf( _g( "How to set <a href=\"%s\">the default document language</a>" ), $CN_HELP_URL )."</p>";
$str .= "\n<!--/UdmComment-->\n";
}
projects / deb / packages.git / blobdiff