X-Git-Url: https://git.deb.at/?a=blobdiff_plain;f=cgi-bin%2Fsearch_packages.pl;h=1912dac8ed41fb5044fd68420e4aa51b355152d2;hb=c049f68b67a8ffdce5280f39f96b38abf005641d;hp=c3877fc04d6ae600602fc1dc05958b15f032c09d;hpb=11d34e2708df7b0bcdfe7d7bcbccdc5d10326457;p=deb%2Fpackages.git

diff --git a/cgi-bin/search_packages.pl b/cgi-bin/search_packages.pl
index c3877fc..1912dac 100755
--- a/cgi-bin/search_packages.pl
+++ b/cgi-bin/search_packages.pl
@@ -191,24 +191,34 @@ if ($searchon eq 'names') {
 
     $keyword = lc $keyword unless $case_bool;
     
-    my %packages;
-    tie %packages, 'DB_File', "$DBDIR/packages_small.db", O_RDONLY, 0666, $DB_BTREE
+    my $obj = tie my %packages, 'DB_File', "$DBDIR/packages_small.db", O_RDONLY, 0666, $DB_BTREE
 	or die "couldn't tie DB $DBDIR/packages_small.db: $!";
     
-    my $result = $packages{$keyword};
-    foreach (split /\000/, $result) {
-	my @data = split ( /\s/, $_, 6 );
-        #FIXME, should be done on db generation
-	if ($data[2] =~ m,/,) {
-	    $data[2] =~ s,/.*$,,;
-	} else {
-	    $data[2] = 'main';
+    if ($exact) {
+	my $result = $packages{$keyword};
+	foreach (split /\000/, $result) {
+	    my @data = split ( /\s/, $_, 7 );
+	    print "DEBUG: Considering entry ".join( ':', @data)."<br>" if $debug > 2;
+	    if ($suites{$data[0]} && ($archs{$data[1]} || $data[1] eq 'all')
+		&& $sections{$data[2]}) {
+		print "DEBUG: Using entry ".join( ':', @data)."<br>" if $debug > 2;
+		push @results, [ $keyword, @data ];
+	    }
 	}
-	print "DEBUG: Considering entry ".join( ':', @data)."<br>" if $debug > 2;
-	if ($suites{$data[0]} && ($archs{$data[1]} || $data[1] eq 'all')
-	    && $sections{$data[2]}) {
-	    print "DEBUG: Using entry ".join( ':', @data)."<br>" if $debug > 2;
-	    push @results, [ $keyword, @data ];
+    } else {
+	while (my ($pkg, $result) = each %packages) {
+            #what's faster? I can't really see a difference
+	    (index($pkg, $keyword) >= 0) or next;
+	    #$pkg =~ /\Q$keyword\E/ or next;
+	    foreach (split /\000/, $packages{$pkg}) {
+		my @data = split ( /\s/, $_, 7 );
+		print "DEBUG: Considering entry ".join( ':', @data)."<br>" if $debug > 2;
+		if ($suites{$data[0]} && ($archs{$data[1]} || $data[1] eq 'all')
+		    && $sections{$data[2]}) {
+		    print "DEBUG: Using entry ".join( ':', @data)."<br>" if $debug > 2;
+		    push @results, [ $pkg , @data ];
+		}
+	    }
 	}
     }
 }
@@ -278,11 +288,12 @@ my (%pkgs, %sect, %part, %desc, %binaries);
 
 unless ($search_on_sources) {
     foreach (@results) {
-	my ($pkg_t, $suite, $arch, $section, $priority, $version, $desc) = @$_;
+	my ($pkg_t, $suite, $arch, $section, $subsection,
+            $priority, $version, $desc) = @$_;
 	
 	my ($package) = $pkg_t =~ m/^(.+)/; # untaint
 	$pkgs{$package}{$suite}{$version}{$arch} = 1;
-	$sect{$package}{$suite}{$version} = 'subsection';
+	$sect{$package}{$suite}{$version} = $subsection;
 	$part{$package}{$suite}{$version} = $section unless $section eq 'main';
 	
 	$desc{$package}{$suite}{$version} = $desc;