X-Git-Url: https://git.deb.at/?p=deb%2Fpackages.git;a=blobdiff_plain;f=lib%2FPackages%2FDoNewPkg.pm;h=44960896ec23061af29edf30453ab0237166e01a;hp=7ee921a3975ee6c14f689d0ccd10dfbca029177a;hb=cc6c820a1e503808b7ac1e2bff132de23f87606b;hpb=2ec757bb58907b15c43548be5601d4f2b8c7caac

diff --git a/lib/Packages/DoNewPkg.pm b/lib/Packages/DoNewPkg.pm
index 7ee921a..4496089 100644
--- a/lib/Packages/DoNewPkg.pm
+++ b/lib/Packages/DoNewPkg.pm
@@ -3,34 +3,32 @@ package Packages::DoNewPkg;
 use strict;
 use warnings;
 
-use Benchmark ':hireswallclock';
-use HTML::Entities;
 use POSIX;
-use XML::RSS;
 use CGI ();
 use Exporter;
 our @ISA = qw( Exporter );
 our @EXPORT = qw( do_newpkg );
 
-use Packages::I18N::Locale;
 use Packages::Search qw( :all );
 use Packages::CGI;
 use Packages::DB;
 use Packages::Config qw( $TOPDIR @SECTIONS $ROOT );
 
 sub do_newpkg {
-    my ($params, $opts, $html_header, $page_content) = @_;
+    my ($params, $opts, $page_content) = @_;
+    my $cat = $opts->{cat};
 
     if ($params->{errors}{suite}) {
-	fatal_error( _g( "suite not valid or not specified" ) );
+	fatal_error( $cat->g( "suite not valid or not specified" ) );
     }
     if (@{$opts->{suite}} > 1) {
-	fatal_error( sprintf( _g( "more than one suite specified for show (%s)" ), "@{$opts->{suite}}" ) );
+	fatal_error( $cat->g( "more than one suite specified for newpkg (%s)",
+			      "@{$opts->{suite}}" ) );
     }
 
     my $sort_func = sub { $_[0][0] cmp $_[1][0] };
     $sort_func = sub { $_[0][1] <=> $_[1][1] or $_[0][0] cmp $_[1][0] }
-    if $opts->{mode} eq 'byage';
+	if $opts->{mode} eq 'byage';
 
     my $suite = $opts->{suite}[0];
     my $one_archive = @{$opts->{archive}} == 1 ?
@@ -39,13 +37,18 @@ sub do_newpkg {
 	$opts->{section}[0] : undef;
 
     my @new_pkgs;
-    #FIXME: move to Packages::DB?
-    open NEWPKG, '<', "$TOPDIR/files/packages/newpkg_info"
-	or die "can't read newpkg_info file: $!";
+    open NEWPKG, '<', "$TOPDIR/files/packages/newpkg_info_$suite"
+	or do {
+	    warn "can't read newpkg_info_$suite: $!";
+	    fatal_error( $cat->g("no newpkg information found for suite %s",
+				 $suite) );
+	    return;
+    };
     while (<NEWPKG>) {
 	chomp;
-	my @data = split /\s/, $_, 10;
+	my @data = split /\s/, $_, 11;
 
+	next unless $data[2]; #removed packages
 	next unless $data[3] eq $suite;
 	next if $one_archive and $data[2] ne $one_archive;
 	next if $one_section and $data[5] ne $one_section;
@@ -56,10 +59,8 @@ sub do_newpkg {
     close NEWPKG;
     
     (my @date)= gmtime();
-    my $now_time = strftime ("%B %d, %Y", @date);
-    my $rss_time = strftime ("%Y-%m-%dT%H:%M+00:00", @date);
-
-    $page_content->{make_url} = sub { return &Packages::CGI::make_url(@_) };
+    #FIXME: compute in the template
+    $page_content->{rss_timestamp} = strftime ("%Y-%m-%dT%H:%M+00:00", @date);
 
     if (@new_pkgs) {
 	$page_content->{new_packages} = [ sort { &$sort_func($a,$b) } @new_pkgs ];
@@ -70,49 +71,6 @@ sub do_newpkg {
     $page_content->{archive} = $one_archive if $one_archive;
     $page_content->{sections} = \@SECTIONS;
 
-#    my @full_path = ($HOSTNAME, $ROOT, $suite);
-#    push @full_path, $one_archive if $one_archive;
-#    my $full_path = join( '/', @full_path );
-
-#     } else { # unless ($opts->{format} eq 'rss')
-# 	my ( $rss_link, $rss_description, $rss_date );
-
-# 	$rss_description = sprintf(_g( "The following packages were added to suite %s%s in the Debian archive during the last 7 days."), $suite,
-# 				   $one_section ? sprintf(_g(" (section %s)"),$one_section):'');
-
-# 	my $rss = new XML::RSS (version => '1.0');
-# 	$rss_link = "$full_path".($one_section?"$one_section/":'')."/newpkg?format=rss";
-# 	$rss->channel(
-# 		      title        => _g("New Debian Packages"),
-# 		      link         => $rss_link,
-# 		      description  => $rss_description,
-# 		      dc => {
-# 			  date       => $rss_time,
-# 			  publisher  => 'debian-www@lists.debian.org',
-# 			  rights     => 'Copyright '.($date[5]+1900).', SPI Inc.',
-# 			  language   => $opts->{lang},
-# 		      },
-# 		      syn => {
-# 			  updatePeriod     => "daily",
-# 			  updateFrequency  => "2",
-# #		      updateBase       => "1901-01-01T00:00+00:00",
-# 		      } );
-
-# 	foreach my $pkg (sort { &$sort_func($a,$b) } @new_pkgs) {
-# 	    $rss->add_item(
-# 			   title       => $pkg->[0],
-# 			   link        => "$full_path/$pkg->[0]",
-# 			   description => $pkg->[-1],
-# 			   dc => {
-# 			       subject  => $pkg->[6],
-# 			   } );
-# 	}
-# 	my $charset = get_charset( $opts->{lang} );
-# 	print &CGI::header( -type => 'application/rss+xml',
-# 			    -charset => $charset );
-# 	print $rss->as_string;
-# 	exit;
-#     }
 }
 
 1;