X-Git-Url: https://git.deb.at/?a=blobdiff_plain;f=lib%2FPackages%2FSearch.pm;h=32ef1e2eedf00d9f8c455966cc2d0dd90f914b44;hb=e297f56fb5ba59c24f4b3d325b8a43fc05c71f5d;hp=9418f63e0c3037b14cd9ce079c34403f28427ed4;hpb=ef769eaccb9ebf7f49b8c3240c9c4d6980072ee5;p=deb%2Fpackages.git

diff --git a/lib/Packages/Search.pm b/lib/Packages/Search.pm
index 9418f63..32ef1e2 100644
--- 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) = @_;
@@ -413,6 +424,7 @@ sub do_names_search {
     $postfixes->seq( $key, $prefixes, R_CURSOR );
     while (index($key, $keyword) >= 0) {
 	if ($prefixes =~ /^\001(\d+)/o) {
+	    debug( "$key has too many hits", 2 );
 	    $too_many_hits += $1;
 	} else {
 	    foreach (split /\000/o, $prefixes) {