X-Git-Url: https://git.deb.at/?a=blobdiff_plain;f=cgi-bin%2Fsearch_packages.pl;h=a7184dc7d5050a4c6a61365536672fdd6f343d27;hb=1d735d4df7e110481faa67897ba4c35936998fc0;hp=25b0e132ea0874a862b3dee434442982b55155a8;hpb=f49363dc272472174dd57c663c2688c33af927cd;p=deb%2Fpackages.git diff --git a/cgi-bin/search_packages.pl b/cgi-bin/search_packages.pl index 25b0e13..a7184dc 100755 --- a/cgi-bin/search_packages.pl +++ b/cgi-bin/search_packages.pl @@ -12,6 +12,7 @@ # see http://www.fsf.org/copyleft/gpl.html for a copy of the license use strict; +use lib '../lib'; use CGI qw( -oldstyle_urls ); use CGI::Carp qw( fatalsToBrowser ); use POSIX; @@ -21,7 +22,10 @@ use DB_File; use Benchmark; use Deb::Versions; +use Packages::Config qw( $DBDIR $ROOT $SEARCH_CGI $SEARCH_PAGE + @SUITES @SECTIONS @ARCHIVES @ARCHITECTURES ); use Packages::CGI; +use Packages::DB; use Packages::Search qw( :all ); use Packages::HTML (); @@ -45,46 +49,15 @@ my $debug = $debug_allowed && $input->param("debug"); $debug = 0 if !defined($debug) || $debug !~ /^\d+$/o; $Packages::CGI::debug = $debug; -# read the configuration -our $config_read_time ||= 0; -our $db_read_time ||= 0; -our $topdir; -our $ROOT; -our @SUITES; -our @SECTIONS; -our @ARCHITECTURES; - -# FIXME: move to own module -my $modtime = (stat( "../config.sh" ))[9]; -if ($modtime > $config_read_time) { - if (!open (C, '<', "../config.sh")) { - error( "Internal Error: Cannot open configuration file." ); - } - while () { - chomp; - $topdir = $1 if /^\s*topdir="?([^\"]*)"?\s*$/o; - $ROOT = $1 if /^\s*root="?([^\"]*)"?\s*$/o; - $Packages::HTML::HOME = $1 if /^\s*home="?([^\"]*)"?\s*$/o; - $Packages::HTML::SEARCH_CGI = $1 if /^\s*searchcgi="?([^\"]*)"?\s*$/o; - $Packages::HTML::SEARCH_PAGE = $1 if /^\s*searchpage="?([^\"]*)"?\s*$/o; - $Packages::HTML::WEBMASTER_MAIL = $1 if /^\s*webmaster="?([^\"]*)"?\s*$/o; - $Packages::HTML::CONTACT_MAIL = $1 if /^\s*contact="?([^\"]*)"?\s*$/o; - @SUITES = split(/\s+/, $1) if /^\s*suites="?([^\"]*)"?\s*$/o; - @SECTIONS = split(/\s+/, $1) if /^\s*sections="?([^\"]*)"?\s*$/o; - @ARCHITECTURES = split(/\s+/, $1) if /^\s*architectures="?([^\"]*)"?\s*$/o; - } - close (C); - debug( "read config ($modtime > $config_read_time)" ); - $config_read_time = $modtime; -} -my $DBDIR = $topdir . "/files/db"; -my $thisscript = $Packages::HTML::SEARCH_CGI; +&Packages::Config::init( '../' ); +&Packages::DB::init(); if (my $path = $input->param('path')) { my @components = map { lc $_ } split /\//, $path; my %SUITES = map { $_ => 1 } @SUITES; my %SECTIONS = map { $_ => 1 } @SECTIONS; + my %ARCHIVES = map { $_ => 1 } @ARCHIVES; my %ARCHITECTURES = map { $_ => 1 } @ARCHITECTURES; foreach (@components) { @@ -92,22 +65,29 @@ if (my $path = $input->param('path')) { $input->param('suite', $_); } elsif ($SECTIONS{$_}) { $input->param('section', $_); - }elsif ($ARCHITECTURES{$_}) { + } elsif ($ARCHIVES{$_}) { + $input->param('archive', $_); + } elsif ($ARCHITECTURES{$_}) { $input->param('arch', $_); + } elsif ($_ eq 'source') { + $input->param('searchon','sourcenames'); } } } my ( $format, $keyword, $case, $subword, $exact, $searchon, - @suites, @sections, @archs ); + @suites, @sections, @archives, @archs ); my %params_def = ( keywords => { default => undef, match => '^\s*([-+\@\w\/.:]+)\s*$', var => \$keyword }, - suite => { default => 'stable', match => '^(\w+)$', + suite => { default => 'stable', match => '^([\w-]+)$', alias => 'version', array => ',', var => \@suites, replace => { all => \@SUITES } }, + archive => { default => 'all', match => '^([\w-]+)$', + array => ',', var => \@archives, + replace => { all => \@ARCHIVES } }, case => { default => 'insensitive', match => '^(\w+)$', var => \$case }, official => { default => 0, match => '^(\w+)$' }, @@ -133,7 +113,7 @@ my %params = Packages::Search::parse_params( $input, \%params_def, \%opts ); #XXX: Don't use alternative output formats yet $format = 'html'; if ($format eq 'html') { - print $input->header; + print $input->header( -charset => 'utf-8' ); } if ($params{errors}{keywords}) { @@ -146,6 +126,7 @@ my $case_bool = ( $case !~ /insensitive/ ); $exact = !$subword unless defined $exact; $opts{h_suites} = { map { $_ => 1 } @suites }; $opts{h_sections} = { map { $_ => 1 } @sections }; +$opts{h_archives} = { map { $_ => 1 } @archives }; $opts{h_archs} = { map { $_ => 1 } @archs }; # for URL construction @@ -166,36 +147,8 @@ debug( "Parameter evaluation took ".timestr($petd) ); my $st0 = new Benchmark; my @results; -our ($obj, $s_obj, $p_obj, $sp_obj, - %packages, %sources, %postf, %spostf, %src2bin, %did2pkg ); - unless (@Packages::CGI::fatal_errors) { - my $dbmodtime = (stat("$DBDIR/packages_small.db"))[9]; - if ($dbmodtime > $db_read_time) { - $obj = tie %packages, 'DB_File', "$DBDIR/packages_small.db", - O_RDONLY, 0666, $DB_BTREE - or die "couldn't tie DB $DBDIR/packages_small.db: $!"; - $s_obj = tie %sources, 'DB_File', "$DBDIR/sources_small.db", - O_RDONLY, 0666, $DB_BTREE - or die "couldn't tie DB $DBDIR/sources_small.db: $!"; - $p_obj = tie %postf, 'DB_File', "$DBDIR/package_postfixes.db", - O_RDONLY, 0666, $DB_BTREE - or die "couldn't tie postfix db $DBDIR/package_postfixes.db: $!"; - $sp_obj = tie %spostf, 'DB_File', "$DBDIR/source_postfixes.db", - O_RDONLY, 0666, $DB_BTREE - or die "couldn't tie postfix db $DBDIR/source_postfixes.db: $!"; - tie %src2bin, 'DB_File', "$DBDIR/sources_packages.db", - O_RDONLY, 0666, $DB_BTREE - or die "couldn't open $DBDIR/sources_packages.db: $!"; - tie %did2pkg, 'DB_File', "$DBDIR/descriptions_packages.db", - O_RDONLY, 0666, $DB_BTREE - or die "couldn't tie DB $DBDIR/descriptions_packages.db: $!"; - - debug( "tied databases ($dbmodtime > $db_read_time)" ); - $db_read_time = $dbmodtime; - } - if ($searchon eq 'names') { push @results, @{ do_names_search( $keyword, \%packages, $p_obj, @@ -204,6 +157,9 @@ unless (@Packages::CGI::fatal_errors) { push @results, @{ do_names_search( $keyword, \%sources, $sp_obj, \&read_src_entry, \%opts ) }; + } elsif ($searchon eq 'contents') { + require "./search_contents.pl"; + &contents($input); } else { push @results, @{ do_names_search( $keyword, \%packages, $p_obj, @@ -256,7 +212,7 @@ if (!@Packages::CGI::fatal_errors && !@results) { if ($exact) { $printed++; - hint( "You have searched only for exact matches of the package name. You can try to search for package names that contain your search string." ); + hint( "You have searched only for exact matches of the package name. You can try to search for package names that contain your search string." ); } } else { if (($suites_enc eq 'all') @@ -269,10 +225,10 @@ if (!@Packages::CGI::fatal_errors && !@results) { unless ($subword) { $printed++; - hint( "You have searched only for words exactly matching your keywords. You can try to search allowing subword matching." ); + hint( "You have searched only for words exactly matching your keywords. You can try to search allowing subword matching." ); } } - hint( ( $printed ? "Or you" : "You" )." can try a different search on the Packages search page." ); + hint( ( $printed ? "Or you" : "You" )." can try a different search on the Packages search page." ); } } @@ -299,47 +255,84 @@ print_errors(); print_hints(); print_debug(); if (@results) { - my (%pkgs, %sect, %part, %desc, %binaries); + my (%pkgs, %subsect, %sect, %archives, %desc, %binaries, %provided_by); unless ($opts{searchon} eq 'sourcenames') { foreach (@results) { - my ($pkg_t, $suite, $arch, $section, $subsection, + my ($pkg_t, $archive, $suite, $arch, $section, $subsection, $priority, $version, $desc) = @$_; my ($pkg) = $pkg_t =~ m/^(.+)/; # untaint - $pkgs{$pkg}{$suite}{$version}{$arch} = 1; - $sect{$pkg}{$suite}{$version} = $subsection; - $part{$pkg}{$suite}{$version} = $section - unless $section eq 'main'; - - $desc{$pkg}{$suite}{$version} = $desc; + if ($arch ne 'virtual') { + my $real_archive; + if ($archive =~ /^(security|non-US)$/) { + $real_archive = $archive; + $archive = 'us'; + } + + $pkgs{$pkg}{$suite}{$archive}{$version}{$arch} = 1; + $subsect{$pkg}{$suite}{$archive}{$version} = $subsection; + $sect{$pkg}{$suite}{$archive}{$version} = $section + unless $section eq 'main'; + $archives{$pkg}{$suite}{$archive}{$version} = $real_archive + if $real_archive; + + $desc{$pkg}{$suite}{$archive}{$version} = $desc; + } else { + $provided_by{$pkg}{$suite}{$archive} = [ split /\s+/, $desc ]; + } } +my @pkgs = sort(keys %pkgs, keys %provided_by); if ($opts{format} eq 'html') { - my ($start, $end) = multipageheader( $input, scalar keys %pkgs, \%opts ); - my $count = 0; + #my ($start, $end) = multipageheader( $input, scalar @pkgs, \%opts ); + print "

Found ".(scalar @pkgs)." matching packages,"; + #my $count = 0; - foreach my $pkg (sort keys %pkgs) { - $count++; - next if $count < $start or $count > $end; + foreach my $pkg (@pkgs) { + #$count++; + #next if $count < $start or $count > $end; printf "

Package %s

\n", $pkg; print "\n"; @@ -347,57 +340,75 @@ if (@results) { } } else { foreach (@results) { - my ($pkg, $suite, $section, $subsection, $priority, + my ($pkg, $archive, $suite, $section, $subsection, $priority, $version) = @$_; - $pkgs{$pkg}{$suite} = $version; - $sect{$pkg}{$suite}{source} = $subsection; - $part{$pkg}{$suite}{source} = $section + my $real_archive = ''; + if ($archive =~ /^(security|non-US)$/) { + $real_archive = $archive; + $archive = 'us'; + } + if (($real_archive eq $archive) && + $pkgs{$pkg}{$suite}{$archive} && + (version_cmp( $pkgs{$pkg}{$suite}{$archive}, $version ) >= 0)) { + next; + } + $pkgs{$pkg}{$suite}{$archive} = $version; + $subsect{$pkg}{$suite}{$archive}{source} = $subsection; + $sect{$pkg}{$suite}{$archive}{source} = $section unless $section eq 'main'; + $archives{$pkg}{$suite}{$archive}{source} = $real_archive + if $real_archive; - $binaries{$pkg}{$suite} = find_binaries( $pkg, $suite, \%src2bin ); + $binaries{$pkg}{$suite}{$archive} = find_binaries( $pkg, $archive, $suite, \%src2bin ); } if ($opts{format} eq 'html') { - my ($start, $end) = multipageheader( $input, scalar keys %pkgs, \%opts ); - my $count = 0; + #my ($start, $end) = multipageheader( $input, scalar keys %pkgs, \%opts ); + print "

Found ".(scalar keys %pkgs)." matching packages,"; + #my $count = 0; foreach my $pkg (sort keys %pkgs) { - $count++; - next if ($count < $start) or ($count > $end); + #$count++; + #next if ($count < $start) or ($count > $end); printf "

Source package %s

\n", $pkg; print "\n"; } } } - printindexline( $input, scalar keys %pkgs, \%opts ); + #printindexline( $input, scalar keys %pkgs, \%opts ); } #print_results(\@results, \%opts) if @results;; my $tet1 = new Benchmark; my $tetd = timediff($tet1, $tet0); -print "Total page evaluation took ".timestr($petd)."
" +print "Total page evaluation took ".timestr($tetd)."
" if $debug_allowed; my $trailer = Packages::HTML::trailer( $ROOT );