X-Git-Url: https://git.deb.at/?a=blobdiff_plain;f=lib%2FPackages%2FPage.pm;h=c77d8facee9f2c358517a179507dbcbe4b2e1227;hb=976d1881dc169228ed327cd52eba12d29bb9bf42;hp=b00eefbab921974b68df2784be42faaeb5df93e6;hpb=264b1245548e5c5494778a813e5e48897168b008;p=deb%2Fpackages.git

diff --git a/lib/Packages/Page.pm b/lib/Packages/Page.pm
index b00eefb..c77d8fa 100644
--- a/lib/Packages/Page.pm
+++ b/lib/Packages/Page.pm
@@ -4,9 +4,14 @@ use strict;
 use warnings;
 
 use Data::Dumper;
+use Exporter;
 use Deb::Versions;
 use Packages::CGI;
 
+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';
 our $SUBSECTION_DEFAULT = 'unknown';
@@ -28,22 +33,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;
@@ -63,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}{name} = $src;
-    $self->{src}{version} = $version;
+    $self->{src}{package} = $src;
+    $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;
@@ -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