Move version info to arch table (only when there are actually multiple

[deb/packages.git] / lib / Packages / Page.pm

diff --git a/lib/Packages/Page.pm b/lib/Packages/Page.pm
index c44a099ffe9e7d19acab17c472e87ff60af84683..c2aff059ff468ac324fb00e6ae98c4ba4d188bff 100644 (file)
--- a/lib/Packages/Page.pm
+++ b/lib/Packages/Page.pm
@@ -5,6 +5,7 @@ use warnings;
 
 use Data::Dumper;
 use Exporter;
+use Locale::gettext;
 use Deb::Versions;
 use Packages::CGI;
 
@@ -33,7 +34,6 @@ sub new {
     return $self;
 }
 
-sub gettext { return $_[0]; }
 sub split_name_mail {
     my $string = shift;
     my ( $name, $email );
@@ -61,7 +61,6 @@ sub add_src_data {
     if ($data{files}) {
        my @files = split /\01/so, $data{files};
        $self->{src}{files} = \@files;
-       print @{$self->{src}{files}};
     }
     $self->{src}{directory} = $data{directory};
     my @uploaders;
@@ -82,6 +81,19 @@ sub add_src_data {
     return 1;
 }
 
+sub add_provided_by {
+    my ($self, $provided_by) = @_;
+
+    $self->{provided_by} ||= [];
+    push @{$self->{provided_by}}, @$provided_by;
+}
+
+sub is_virtual {
+    my ($self) = @_;
+
+    return (exists($self->{provided_by}) && !exists($self->{versions}));
+}
+
 our @TAKE_NEWEST = qw( description essential priority section subsection tag
                       archive source source-version );
 our @STORE_ALL = qw( version source source-version installed-size size
@@ -200,42 +212,6 @@ sub get_arch_field {
     return \%result;
 }
 
-sub get_versions {
-    my ($self) = @_;
-
-    my %versions;
-    foreach (keys %{$self->{versions}}) {
-       my $version = $self->{versions}{$_}{version};
-       $versions{$version} ||= [];
-       push @{$versions{$version}}, $_;
-    }
-
-    return \%versions;
-}
-
-sub get_version_string {
-    my ($self) = @_;
-
-    my $versions = $self->get_versions;
-    my @versions = version_sort keys %$versions;
-    my (@v_str, $v_str, $v_str_arch);
-    if ( scalar @versions == 1 ) {
-       @v_str = ( [ $versions[0], undef ] );
-       $v_str = $versions[0];
-       $v_str_arch = $versions[0];
-    } else {
-       my @v_str_arch;
-       foreach ( @versions ) {
-           push @v_str, [ $_, $versions->{$_} ];
-           push @v_str_arch, "$_ [".join(', ', @{$versions->{$_}})."]";
-       }
-       $v_str_arch = join( ", ", @v_str_arch );
-       $v_str = join( ", ",  @versions );
-    }
-
-    return ($v_str, $v_str_arch, \@v_str);
-}
-
 sub get_dep_field {
     my ($self, $dep_field) = @_;