X-Git-Url: https://git.deb.at/?a=blobdiff_plain;f=lib%2FPackages%2FPage.pm;h=47a0f6b0ccd0299721fb591510bf6f6ec2d617bd;hb=6a92e679063092eefd6fc58d627db669deecf8ff;hp=bc7fdc03f4faf54d4815ae6755ed5201af91818c;hpb=87124f967c3da82618899b3d2c114981b12ffb7f;p=deb%2Fpackages.git

diff --git a/lib/Packages/Page.pm b/lib/Packages/Page.pm
index bc7fdc0..47a0f6b 100644
--- a/lib/Packages/Page.pm
+++ b/lib/Packages/Page.pm
@@ -4,9 +4,13 @@ use strict;
 use warnings;
 
 use Data::Dumper;
+use Exporter;
 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,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;
@@ -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;
@@ -148,7 +126,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};