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 bc7fdc03f4faf54d4815ae6755ed5201af91818c..c2aff059ff468ac324fb00e6ae98c4ba4d188bff 100644 (file)
--- a/lib/Packages/Page.pm
+++ b/lib/Packages/Page.pm
@@ -4,9 +4,14 @@ use strict;
 use warnings;
 
 use Data::Dumper;
+use Exporter;
+use Locale::gettext;
 use Deb::Versions;
 use Packages::CGI;
-use IO::String;
+
+our @ISA = qw( Exporter );
+our @EXPORT_OK = qw( split_name_mail parse_deps );
+our %EXPORT_TAGS = ( all => [ @EXPORT_OK ] );
 
 our $ARCHIVE_DEFAULT = '';
 our $SECTION_DEFAULT = 'main';
@@ -29,23 +34,6 @@ sub new {
     return $self;
 }
 
-sub merge_data {
-    my ($self, $pkg, $version, $architecture, $data) = @_;
-
-    my %data = ( package => $pkg,
-                    version => $version,
-                    architecture => $architecture );
-    chomp($data);
-    while ($data =~ /^(\S+):\s*(.*)\s*$/mg) {
-       my ($key, $value) = ($1, $2);
-       $key =~ tr [A-Z] [a-z];
-       $data{$key} = $value;
-    }
-#      debug( "Merge package:\n".Dumper(\%data), 3 );
-    return $self->merge_package( \%data );
-}
-
-sub gettext { return $_[0]; }
 sub split_name_mail {
     my $string = shift;
     my ( $name, $email );
@@ -64,25 +52,15 @@ sub split_name_mail {
 }
 
 sub add_src_data {
-    my ($self, $src, $version, $data) = @_;
-
-    chomp($data);
-    my %data = ();
-    while ($data =~ /^(\S+):\s*(.*)\s*$/mg) {
-       my ($key, $value) = ($1, $2);
-       $key =~ tr [A-Z] [a-z];
-       $data{$key} = $value;
-    }
+    my ($self, $src, $data) = @_;
+
+    my %data = split /\00/o, $data;
 
-    $self->{src}{name} = $src;
-    $self->{src}{version} = $version;
+    $self->{src}{package} = $src;
+    $self->{src}{version} = $data{version};
     if ($data{files}) {
-       $data{files} =~ s/\A\s*//o; # remove leading spaces
-       $self->{src}{files} = [];
-        foreach my $sf ( split( /\n\s*/, $data{files} ) ) {
-            # md5, size, name
-            push @{$self->{src}{files}}, [ split( /\s+/, $sf) ];
-        }
+       my @files = split /\01/so, $data{files};
+       $self->{src}{files} = \@files;
     }
     $self->{src}{directory} = $data{directory};
     my @uploaders;
@@ -103,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
@@ -148,7 +139,7 @@ sub merge_package {
     if (!$self->{versions}{$data->{architecture}}
        || $is_newest
        || (version_cmp( $data->{version},
-                        $self->{versions}{$data->{architecture}} ) > 0)) {
+                        $self->{versions}{$data->{architecture}}{version} ) > 0)) {
        foreach my $key (@STORE_ALL) {
            $self->{versions}{$data->{architecture}}{$key}
            = $data->{$key};
@@ -221,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) = @_;