Fix several minor issues, mostly configuration-like stuff

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

diff --git a/lib/Packages/Page.pm b/lib/Packages/Page.pm
index bd746880c0397cef259cf485bdbdc9c5928578c5..b00eefbab921974b68df2784be42faaeb5df93e6 100644 (file)
--- a/lib/Packages/Page.pm
+++ b/lib/Packages/Page.pm
@@ -6,7 +6,6 @@ use warnings;
 use Data::Dumper;
 use Deb::Versions;
 use Packages::CGI;
-use IO::String;
 
 our $ARCHIVE_DEFAULT = '';
 our $SECTION_DEFAULT = 'main';
@@ -32,27 +31,17 @@ sub new {
 sub merge_data {
     my ($self, $pkg, $version, $architecture, $data) = @_;
 
-    local $/ = "";
-    my $strio = IO::String->new($data);
-    my $merged = 0;
-    while (<$strio>) {
-        next if /^\s*$/;
-        my %data = ( package => $pkg,
-                    version => $version,
-                    architecture => $architecture );
-        chomp;
-        s/\n /\377/g;
-        while (/^(\S+):\s*(.*)\s*$/mg) {
-            my ($key, $value) = ($1, $2);
-            $value =~ s/\377/\n /g;
-            $key =~ tr [A-Z] [a-z];
-            $data{$key} = $value;
-        }
-#      debug( "Merge package:\n".Dumper(\%data), 3 );
-        $merged += $self->merge_package( \%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;
     }
-    close DATA;
-    return $merged;
+#      debug( "Merge package:\n".Dumper(\%data), 3 );
+    return $self->merge_package( \%data );
 }
 
 sub gettext { return $_[0]; }
@@ -76,33 +65,26 @@ sub split_name_mail {
 sub add_src_data {
     my ($self, $src, $version, $data) = @_;
 
-    local $/ = "";
-    my $strio = IO::String->new($data);
-    my %data;
-    while (<$strio>) {
-        next if /^\s*$/;
-        chomp;
-       %data = ();
-        s/\n /\377/g;
-        while (/^(\S+):\s*(.*)\s*$/mg) {
-            my ($key, $value) = ($1, $2);
-            $value =~ s/\377/\n /g;
-            $key =~ tr [A-Z] [a-z];
-            $data{$key} = $value;
-        }
+    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;
     }
-    close DATA;
 
     $self->{src}{name} = $src;
     $self->{src}{version} = $version;
     if ($data{files}) {
-       $data{files} =~ s/\A\s*//o; # remove leading spaces
        $self->{src}{files} = [];
-        foreach my $sf ( split( /\n\s*/, $data{files} ) ) {
+        foreach my $sf ( split( /\377/, $data{files} ) ) {
+           next unless $sf;
             # md5, size, name
             push @{$self->{src}{files}}, [ split( /\s+/, $sf) ];
         }
     }
+    $self->{src}{directory} = $data{directory};
     my @uploaders;
     if ($data{maintainer} ||= '') {
        push @uploaders, [ split_name_mail( $data{maintainer} ) ];
@@ -166,7 +148,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};