change read_entry_simple again to use

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

diff --git a/lib/Packages/Search.pm b/lib/Packages/Search.pm
index c0555e2bb302b0dfdd241e742c9370ccae205cb4..32ef1e2eedf00d9f8c455966cc2d0dd90f914b44 100644 (file)
--- a/lib/Packages/Search.pm
+++ b/lib/Packages/Search.pm
@@ -134,9 +134,10 @@ sub parse_params {
        my @p_value_no_replace = @p_value;
 
        if ($params{$param}{replace} && @p_value) {
-           @p_value = ();
            foreach my $pattern (keys %{$params{$param}{replace}}) {
-               foreach (@p_value_no_replace) {
+               my @p_value_tmp = @p_value;
+               @p_value = ();
+               foreach (@p_value_tmp) {
                    if ($_ eq $pattern) {
                        my $replacement = $params{$param}{replace}{$_};
                        if (ref $replacement) {
@@ -364,21 +365,31 @@ sub read_entry_simple {
     my $result = $hash->{$key} || '';
     debug( "read_entry_simple: key=$key, archives=".
           join(" ",(keys %$archives)).", suite=$suite", 1);
-    my @data_fuzzy;
+    my (@data_fuzzy, @data_virtual, @data_fuzzy_virtual);
     foreach (split /\000/o, $result) {
        my @data = split ( /\s/o, $_, 8 );
        debug( "Considering entry ".join( ':', @data), 2);
        if ($data[1] eq $suite) {
-           if ($archives->{$data[0]}) {
+           if ($archives->{$data[0]}
+               && ($data[2] ne 'virtual')) {
                debug( "Using entry ".join( ':', @data), 2);
                return \@data;
-           } elsif ($data[0] eq 'us') {
+           } elsif ($archives->{$data[0]}) {
+               debug( "Virtual entry ".join( ':', @data), 2);
+               @data_virtual = @data;
+           } elsif (($data[0] eq 'us')
+                    && ($data[2] ne 'virtual')) {
                debug( "Fuzzy entry ".join( ':', @data), 2);
                @data_fuzzy = @data;
+           } elsif ($data[0] eq 'us') {
+               debug( "Virtual fuzzy entry ".join( ':', @data), 2);
+               @data_fuzzy_virtual = @data;
            }
        } 
     }
-    return \@data_fuzzy;
+    return \@data_virtual if @data_virtual;
+    return \@data_fuzzy if @data_fuzzy;
+    return \@data_fuzzy_virtual;
 }
 sub read_src_entry_all {
     my ($hash, $key, $results, $non_results, $opts) = @_;