X-Git-Url: https://git.deb.at/w?a=blobdiff_plain;f=lib%2FPackages%2FSearch.pm;h=e863717b97b2e795683a6dd8850bb8f8a84f8f07;hb=202eb3b349348d04e15926777d7a3b7f8526c557;hp=32ef1e2eedf00d9f8c455966cc2d0dd90f914b44;hpb=a7c90835e393ff56dd9c84f022347554325bc916;p=deb%2Fpackages.git

diff --git a/lib/Packages/Search.pm b/lib/Packages/Search.pm
index 32ef1e2..e863717 100644
--- a/lib/Packages/Search.pm
+++ b/lib/Packages/Search.pm
@@ -43,7 +43,7 @@ package Packages::Search;
 use strict;
 use warnings;
 
-use CGI qw( -oldstyle_urls );
+#use CGI ();
 use POSIX;
 use HTML::Entities;
 use DB_File;
@@ -78,7 +78,7 @@ sub parse_params {
     my %params_ret = ( values => {}, errors => {} );
     my %params;
     if ($USE_PAGED_MODE) {
-        debug( "Use PAGED_MODE", 2 );
+        debug( "Use PAGED_MODE", 2 ) if DEBUG;
         %params = %$params_def;
         foreach (keys %page_params) {
             delete $params{$_};
@@ -90,7 +90,7 @@ sub parse_params {
 
     foreach my $param ( keys %params ) {
 	
-	debug( "Param <strong>$param</strong>", 2 );
+	debug( "Param <strong>$param</strong>", 2 ) if DEBUG;
 
 	my $p_value_orig = $cgi->param($param);
 
@@ -104,11 +104,11 @@ sub parse_params {
 
 	my @p_value = ($p_value_orig);
 
-	debug( "Value (Orig) ".($p_value_orig||""), 2 );
+	debug( "Value (Orig) ".($p_value_orig||""), 2 ) if DEBUG;
 
 	if ($params_def->{$param}{array} && defined $p_value_orig) {
 	    @p_value = split /$params_def->{$param}{array}/, $p_value_orig;
-	    debug( "Value (Array Split) ". join('##',@p_value), 2 );
+	    debug( "Value (Array Split) ". join('##',@p_value), 2 ) if DEBUG;
 	}
 
 	if ($params_def->{$param}{match} && defined $p_value_orig) {
@@ -118,7 +118,7 @@ sub parse_params {
 	}
 	@p_value = grep { defined $_ } @p_value;
 
-	debug( "Value (Match) ". join('##',@p_value), 2 );
+	debug( "Value (Match) ". join('##',@p_value), 2 ) if DEBUG;
 
 	unless (@p_value) {
 	    if (defined $params{$param}{default}) {
@@ -130,7 +130,7 @@ sub parse_params {
 	    }
 	}
 
-	debug( "Value (Default) ". join('##',@p_value), 2 );
+	debug( "Value (Default) ". join('##',@p_value), 2 ) if DEBUG;
 	my @p_value_no_replace = @p_value;
 
 	if ($params{$param}{replace} && @p_value) {
@@ -152,7 +152,7 @@ sub parse_params {
 	    }
 	}
 	
-	debug( "Value (Final) ". join('##',@p_value), 2 );
+	debug( "Value (Final) ". join('##',@p_value), 2 ) if DEBUG;
 
 	if ($params_def->{$param}{array}) {
 	    $params_ret{values}{$param} = {
@@ -198,7 +198,7 @@ sub end {
     my $params = shift;
 
     use Data::Dumper;
-    debug( "end: ".Dumper($params) );
+    debug( "end: ".Dumper($params) ) if DEBUG;
     my $page = $params->{page}
     || DEFAULT_PAGE;
     my $res_per_page = $params->{number}
@@ -340,15 +340,27 @@ sub printindexline {
 
 sub read_entry_all {
     my ($hash, $key, $results, $non_results, $opts) = @_;
-    my $result = $hash->{$key} || '';
+    my ($virt, $result) = split /\000/o, $hash->{$key} || "-\01-", 2;
+
+    my %virt = split /\01/o, $virt;
+    while (my ($suite, $provides) = each %virt) {
+	next if $suite eq '-';
+	if ($opts->{h_suites}{$suite}) {
+	    push @$results, [ $key, "-", $suite, 'virtual', 'v', 'v', 'v', 'v',
+			      $provides];
+	} else {
+	    push @$non_results, [ $key, "-", $suite, 'virtual', 'v', 'v', 'v', 'v',
+				  $provides];
+	}
+    }
+
     foreach (split /\000/o, $result) {
 	my @data = split ( /\s/o, $_, 8 );
-	debug( "Considering entry ".join( ':', @data), 2);
-	if ($opts->{h_archives}{$data[0]} && $opts->{h_suites}{$data[1]}
-	    && ($opts->{h_archs}{$data[2]} || $data[2] eq 'all'
-		|| $data[2] eq 'virtual')
-	    && ($opts->{h_sections}{$data[3]} || $data[3] eq 'v')) {
-	    debug( "Using entry ".join( ':', @data), 2);
+	debug( "Considering entry ".join( ':', @data), 2) if DEBUG;
+	if ($opts->{h_suites}{$data[1]}
+	    && ($opts->{h_archs}{$data[2]} || $data[2] eq 'all')
+	    && $opts->{h_sections}{$data[3]}) {
+	    debug( "Using entry ".join( ':', @data), 2) if DEBUG;
 	    push @$results, [ $key, @data ];
 	} else {
 	    push @$non_results, [ $key, @data ];
@@ -360,48 +372,50 @@ sub read_entry {
     my @non_results;
     read_entry_all( $hash, $key, $results, \@non_results, $opts );
 }
+
+#FIXME: make configurable
+my %fallback_suites = (
+		       'stable-backports' => 'stable',
+		       'stable-volatile' => 'stable',
+		       experimental => 'unstable' );
+
 sub read_entry_simple {
     my ($hash, $key, $archives, $suite) = @_;
-    my $result = $hash->{$key} || '';
+    # FIXME: drop $archives
+
+    my ($virt, $result) = split /\000/o, $hash->{$key} || "-\01-\0", 2;
+    my %virt = split /\01/o, $virt; 
     debug( "read_entry_simple: key=$key, archives=".
-	   join(" ",(keys %$archives)).", suite=$suite", 1);
-    my (@data_fuzzy, @data_virtual, @data_fuzzy_virtual);
+	   join(" ",(keys %$archives)).", suite=$suite", 1) if DEBUG;
+    # FIXME: not all of the 2^4=16 combinations of empty(results),
+    # empty(virt{suite}), empty(fb_result), empty(virt{fb_suite}) are dealt
+    # with correctly, but it's adequate enough for now
+    return [ $virt{$suite} ] unless defined $result;
     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]}
-		&& ($data[2] ne 'virtual')) {
-		debug( "Using entry ".join( ':', @data), 2);
-		return \@data;
-	    } 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;
-	    }
-	} 
+	debug( "use entry: @data", 2 ) if DEBUG && $data[1] eq $suite;
+	return [ $virt{$suite}, @data ] if $data[1] eq $suite;
+    }
+    if (my $fb_suite = $fallback_suites{$suite}) {
+	my $fb_result = read_entry_simple( $hash, $key, $archives, $fb_suite );
+	my $fb_virt = shift(@$fb_result);
+	$virt{$suite} .= $fb_virt if $fb_virt;
+	return [ $virt{$suite}, @$fb_result ] if @$fb_result;
     }
-    return \@data_virtual if @data_virtual;
-    return \@data_fuzzy if @data_fuzzy;
-    return \@data_fuzzy_virtual;
+    return [ $virt{$suite} ];
 }
+
 sub read_src_entry_all {
     my ($hash, $key, $results, $non_results, $opts) = @_;
     my $result = $hash->{$key} || '';
-    debug( "read_src_entry_all: key=$key", 1);
+    debug( "read_src_entry_all: key=$key", 1) if DEBUG;
     foreach (split /\000/o, $result) {
 	my @data = split ( /\s/o, $_, 6 );
-	debug( "Considering entry ".join( ':', @data), 2);
+	debug( "Considering entry ".join( ':', @data), 2) if DEBUG;
 	if ($opts->{h_archives}{$data[0]}
 	    && $opts->{h_suites}{$data[1]}
 	    && $opts->{h_sections}{$data[2]}) {
-	    debug( "Using entry ".join( ':', @data), 2);
+	    debug( "Using entry ".join( ':', @data), 2) if DEBUG;
 	    push @$results, [ $key, @data ];
 	} else {
 	    push @$non_results, [ $key, @data ];
@@ -424,12 +438,12 @@ 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 );
+	    debug( "$key has too many hits", 2 ) if DEBUG;
 	    $too_many_hits += $1;
 	} else {
 	    foreach (split /\000/o, $prefixes) {
 		$_ = '' if $_ eq '^';
-		debug( "add word $_$key", 2);
+		debug( "add word $_$key", 2) if DEBUG;
 		$pkgs{$_.$key}++;
 	    }
 	}
@@ -460,17 +474,19 @@ sub do_fulltext_search {
 
     my $numres = 0;
     my %tmp_results;
-    open DESC, '<', "$file"
+    # fgrep is seriously faster than using perl
+    open DESC, '-|', 'fgrep', '-n', '--', $keyword, $file
 	or die "couldn't open $file: $!";
     while (<DESC>) {
-	next if (index $_, $keyword) < 0;
-	debug( "Matched line $.: $_", 2);
-	my $result = $did2pkg->{$.};
+	/^(\d+)/;
+	my $nr = $1;
+	debug( "Matched line $_", 2) if DEBUG;
+	my $result = $did2pkg->{$nr};
 	foreach (split /\000/o, $result) {
 	    my @data = split /\s/, $_, 3;
-#	    debug ("Considering $data[0], arch = $data[2]", 3);
+#	    debug ("Considering $data[0], arch = $data[2]", 3) if DEBUG;
 #	    next unless $data[2] eq 'all' || $opts->{h_archs}{$data[2]};
-#	    debug ("Ok", 3);
+#	    debug ("Ok", 3) if DEBUG;
 	    $numres++ unless $tmp_results{$data[0]}++;
 	}
 	last if $numres > 100;
@@ -492,11 +508,11 @@ sub find_binaries {
     foreach (split /\000/o, $bins) {
 	my @data = split /\s/, $_, 5;
 
-	debug( "find_binaries: considering @data", 3 );
+	debug( "find_binaries: considering @data", 3 ) if DEBUG;
 	if (($data[0] eq $archive)
 	    && ($data[1] eq $suite)) {
 	    $bins{$data[2]}++;
-	    debug( "find_binaries: using @data", 3 );
+	    debug( "find_binaries: using @data", 3 ) if DEBUG;
 	}
     }