X-Git-Url: https://git.deb.at/w?a=blobdiff_plain;f=cgi-bin%2Fsearch_packages.pl;h=d63d7e993d8c8602e6701d510dfd76b5771ab726;hb=5302dfd04aedeb0c9986f385caf9459edc8108cc;hp=f6df10c95635a882bc87a825eaf698266ae0777c;hpb=7837241d743061df9f58680a9b786e48d3365a48;p=deb%2Fpackages.git

diff --git a/cgi-bin/search_packages.pl b/cgi-bin/search_packages.pl
index f6df10c..d63d7e9 100755
--- a/cgi-bin/search_packages.pl
+++ b/cgi-bin/search_packages.pl
@@ -26,7 +26,7 @@ use Deb::Versions;
 use Packages::Search qw( :all );
 use Packages::HTML ();
 
-my $thisscript = "search_packages.pl";
+my $thisscript = $Packages::HTML::SEARCH_CGI;
 my $HOME = "http://www.debian.org";
 my $ROOT = "";
 my $SEARCHPAGE = "http://packages.debian.org/";
@@ -44,12 +44,18 @@ my %ARCHITECTURES = map { $_ => 1 } @ARCHITECTURES;
 $ENV{PATH} = "/bin:/usr/bin";
 
 # Read in all the variables set by the form
-my $input = new CGI;
+my $input;
+if ($ARGV[0] eq 'php') {
+	$input = new CGI(\*STDIN);
+} else {
+	$input = new CGI;
+}
 
 my $pet0 = new Benchmark;
 # use this to disable debugging in production mode completly
 my $debug_allowed = 1;
 my $debug = $debug_allowed && $input->param("debug");
+$debug = 0 if not defined($debug);
 $Search::Param::debug = 1 if $debug > 1;
 
 # If you want, just print out a list of all of the variables and exit.
@@ -214,22 +220,21 @@ sub read_src_entry {
 	}
     }
 }
-
-
-if ($searchon eq 'names') {
+sub do_names_search {
+    my ($keyword, $file, $postfix_file, $read_entry) = @_;
 
     $keyword = lc $keyword unless $case_bool;
     
-    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 $obj = tie my %packages, 'DB_File', "$DBDIR/$file", O_RDONLY, 0666, $DB_BTREE
+	or die "couldn't tie DB $DBDIR/$file: $!";
     
     if ($exact) {
-	read_entry( \%packages, $keyword, \@results );
+	&$read_entry( \%packages, $keyword, \@results );
     } else {
 	my ($key, $prefixes) = ($keyword, '');
 	my %pkgs;
-	my $p_obj = tie my %pref, 'DB_File', "$DBDIR/package_postfixes.db", O_RDONLY, 0666, $DB_BTREE
-	    or die "couldn't tie postfix db $DBDIR/package_postfixes.db: $!";
+	my $p_obj = tie my %pref, 'DB_File', "$DBDIR/$postfix_file", O_RDONLY, 0666, $DB_BTREE
+	    or die "couldn't tie postfix db $DBDIR/$postfix_file: $!";
 	$p_obj->seq( $key, $prefixes, R_CURSOR );
 	do {
             if ($prefixes =~ /^\001(\d+)/o) {
@@ -253,33 +258,17 @@ if ($searchon eq 'names') {
 	    %pkgs = ( $keyword => 1 );
 	}
 	foreach my $pkg (sort keys %pkgs) {
-	    read_entry( \%packages, $pkg, \@results );
+	    &$read_entry( \%packages, $pkg, \@results );
 	}
     }
+}
+
+if ($searchon eq 'names') {
+    do_names_search( $keyword, 'packages_small.db',
+		     'package_postfixes.db', \&read_entry );
 } elsif ($searchon eq 'sourcenames') {
- 
-    $keyword = lc $keyword unless $case_bool;
-    
-    my $obj = tie my %packages, 'DB_File', "$DBDIR/sources_small.db", O_RDONLY, 0666, $DB_BTREE
-	or die "couldn't tie DB $DBDIR/sources_small.db: $!";
-    
-    if ($exact) {
-	read_src_entry( \%packages, $keyword, \@results );
-    } 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/, $result) {
-		my @data = split ( /\s/, $_, 5 );
-		print "DEBUG: Considering entry ".join( ':', @data)."<br>" if $debug > 2;
-		if ($suites{$data[0]} && $sections{$data[1]}) {
-		    print "DEBUG: Using entry ".join( ':', @data)."<br>" if $debug > 2;
-		    push @results, [ $pkg , @data ];
-		}
-	    }
-	}
-    }
+    do_names_search( $keyword, 'sources_small.db',
+		     'source_postfixes.db', \&read_src_entry );
 } else {
 
     my @lines;