Merge commit 'alioth/master' into debian-master

[deb/packages.git] / bin / create_index_pages

diff --git a/bin/create_index_pages b/bin/create_index_pages
index 7f35b31a4ffe57f0dcdb8d8388d24f75b37de86b..7847d8830f902a566ba9b55755871bccb8219790 100755 (executable)
--- a/bin/create_index_pages
+++ b/bin/create_index_pages
@@ -27,8 +27,9 @@ delete $ENV{'LANG'};
 delete $ENV{'LC_ALL'};
 delete $ENV{'LC_MESSAGES'};
 bindtextdomain ( 'pdo', $LOCALES );
-bindtextdomain ( 'sections', $LOCALES );
 bindtextdomain ( 'templates', $LOCALES );
+bindtextdomain ( 'sections', $LOCALES );
+bindtextdomain ( 'langs', $LOCALES );
 textdomain( 'pdo' );
 
 my $wwwdir = "$TOPDIR/www";
@@ -50,18 +51,10 @@ my $priorities = retrieve "$DBDIR/priorities.info";
 #use Data::Dumper;
 #print STDERR Dumper($sections, $subsections, $priorities);
 
-my (%pages, %tt_vars);
-
-$tt_vars{make_search_url} = sub { return &Packages::CGI::make_search_url(@_) };
-$tt_vars{make_url} = sub { return &Packages::CGI::make_url(@_) };
-$tt_vars{g} = sub { return &Packages::I18N::Locale::tt_gettext(@_) };
-# needed to work around the limitations of the the FILTER syntax
-$tt_vars{html_encode} = sub { return HTML::Entities::encode_entities(@_,'<>&"') };
-$tt_vars{uri_escape} = sub { return URI::Escape::uri_escape(@_) };
-$tt_vars{quotemeta} = sub { return quotemeta($_[0]) };
+my (%pages);
 
-my $template = new Packages::Template( "$TOPDIR/templates", 'html', \%tt_vars );
-my $txt_template = new Packages::Template( "$TOPDIR/templates", 'txt', \%tt_vars );
+my $template = new Packages::Template( "$TOPDIR/templates", 'html');
+my $txt_template = new Packages::Template( "$TOPDIR/templates", 'txt');
 
 print "write suite index files ...\n";
 foreach my $s (@SUITES) {
@@ -113,7 +106,7 @@ while (my ($pkg, $data) = each %packages) {
     my ($virt, $p_data) = split /\000/o, $data, 2;
     %virt = split /\01/o, $virt; 
     foreach (split /\000/o, $p_data||'') {
-       my @data = split ( /\s/o, $_, 8 );
+       my @data = split ( /\s/o, $_, 9 );
        $pkg{$data[1]} ||= new Packages::Page( $pkg );
        $pkg{$data[1]}->merge_package( { package => $pkg,
                                         archive => $data[0],
@@ -123,7 +116,7 @@ while (my ($pkg, $data) = each %packages) {
                                         subsection => $data[4],
                                         priority => $data[5],
                                         version => $data[6],
-                                        description => $data[7] } );
+                                        description => $data[8] } );
     }
     foreach (keys %virt) {
        next if $_ eq '-';