X-Git-Url: https://git.deb.at/?a=blobdiff_plain;f=lib%2FPackages%2FPage.pm;h=3eb31985843d04af7c69ad3f45e87656424ab0ab;hb=8d29452530e823cbcd07a30898e98abe565a046c;hp=d57126ea4825674aba5c432f667fa90a0773f9e0;hpb=f46c14dbc13274569f533b19e27c61960ea9bacd;p=deb%2Fpackages.git

diff --git a/lib/Packages/Page.pm b/lib/Packages/Page.pm
index d57126e..3eb3198 100644
--- 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,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 );
@@ -68,26 +52,15 @@ sub split_name_mail {
 }
 
 sub add_src_data {
-    my ($self, $src, $version, $data) = @_;
-
-    chomp($data);
-    my %data = ();
-    $data =~ s/\n\s+/\377/g;
-    while ($data =~ /^(\S+):\s*(.*)\s*$/mog) {
-	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}{package} = $src;
-    $self->{src}{version} = $version;
+    $self->{src}{version} = $data{version};
     if ($data{files}) {
-	$self->{src}{files} = [];
-        foreach my $sf ( split( /\377/, $data{files} ) ) {
-	    next unless $sf;
-            # 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;
@@ -108,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
@@ -121,10 +107,10 @@ sub merge_package {
     ($data->{package} && $data->{version} && $data->{architecture}) || return;
     $self->{package} ||= $data->{package};
     ($self->{package} eq $data->{package}) || return;
-    debug( "merge package $data->{package}/$data->{version}/$data->{architecture} into $self (".($self->{newest}||'').")", 2 );
+    debug( "merge package $data->{package}/$data->{version}/$data->{architecture} into $self (".($self->{newest}||'').")", 2 ) if DEBUG;
 
     unless ($self->{newest}) {
-	debug( "package $data->{package}/$data->{version}/$data->{architecture} is first to merge", 3 );
+	debug( "package $data->{package}/$data->{version}/$data->{architecture} is first to merge", 3 ) if DEBUG;
 	foreach my $key (@TAKE_NEWEST) {
 	    $self->{data}{$key} = $data->{$key};
 	}
@@ -140,16 +126,16 @@ sub merge_package {
         return 1;
     }
 
-    debug( "package $data->{package}/$data->{version}/$data->{architecture} is subsequent merge", 3 );
+    debug( "package $data->{package}/$data->{version}/$data->{architecture} is subsequent merge", 3 ) if DEBUG;
     my $is_newest;
-    if ($is_newest =
-	(version_cmp( $data->{version}, $self->{newest} ) > 0)) {
+    my $cmp = version_cmp( $data->{version}, $self->{newest} );
+    if ($is_newest = ($cmp > 0)) {
 	$self->{newest} = $data->{version};
 	foreach my $key (@TAKE_NEWEST) {
 	    $self->{data}{$key} = $data->{$key};
 	}
     }
-    debug( "is_newest= ".($is_newest||0), 3 );
+    debug( "is_newest= ".($is_newest||0), 3 ) if DEBUG;
     if (!$self->{versions}{$data->{architecture}}
 	|| $is_newest
 	|| (version_cmp( $data->{version},
@@ -271,14 +257,14 @@ sub get_dep_field {
     foreach my $a ( @architectures ) {
 	next unless exists $self->{dep_fields}{$a}{$dep_field};
 	my ($a_deps_norm, $a_deps) = @{$self->{dep_fields}{$a}{$dep_field}};
-#	debug( "get_dep_field: $dep_field/$a: ".Dumper($a_deps_norm,$a_deps), 3 );
+#	debug( "get_dep_field: $dep_field/$a: ".Dumper($a_deps_norm,$a_deps), 3 ) if DEBUG;
 	for ( my $i=0; $i < @$a_deps; $i++ ) { # splitted by ,	    
 	    $dep_pkgs{$a_deps_norm->[$i]} = $a_deps->[$i];
 	    $arch_deps{$a}{$a_deps_norm->[$i]}++;
 	}
     }
     @architectures = sort keys %arch_deps;
- #   debug( "get_dep_field called:\n ".Dumper( \%dep_pkgs, \%arch_deps ), 3 );
+ #   debug( "get_dep_field called:\n ".Dumper( \%dep_pkgs, \%arch_deps ), 3 ) if DEBUG;
     
     my @deps;
     if ( %dep_pkgs ) {