X-Git-Url: https://git.deb.at/?a=blobdiff_plain;f=lib%2FPackages%2FSearch.pm;h=931747c618ed84b4863f9d3a183fbff349983835;hb=a4e6ac9c039c1af7b853b8b3a616035b83f1bfd9;hp=ee3b7d2e3e56cf6aee45ab7844cd759e1f6151ff;hpb=d293eabeae6396dbf18640c6c25bb41c05e42349;p=deb%2Fpackages.git
diff --git a/lib/Packages/Search.pm b/lib/Packages/Search.pm
index ee3b7d2..931747c 100644
--- a/lib/Packages/Search.pm
+++ b/lib/Packages/Search.pm
@@ -43,17 +43,21 @@ package Packages::Search;
use strict;
use warnings;
-use CGI qw( -oldstyle_urls );
+#use CGI ();
use POSIX;
use HTML::Entities;
+use DB_File;
use Deb::Versions;
+use Packages::CGI;
use Exporter;
our @ISA = qw( Exporter );
-our @EXPORT_OK = qw( nextlink prevlink indexline
- resperpagelink );
+our @EXPORT_OK = qw( read_entry read_entry_all read_entry_simple
+ read_src_entry read_src_entry_all find_binaries
+ do_names_search do_fulltext_search
+ );
our %EXPORT_TAGS = ( all => [ @EXPORT_OK ] );
our $VERSION = 0.01;
@@ -66,7 +70,7 @@ our %page_params = ( page => { default => DEFAULT_PAGE,
number => { default => DEFAULT_RES_PER_PAGE,
match => '(\d+)' } );
-our $debug = 0;
+our $too_many_hits = 0;
sub parse_params {
my ( $cgi, $params_def, $opts ) = @_;
@@ -74,7 +78,7 @@ sub parse_params {
my %params_ret = ( values => {}, errors => {} );
my %params;
if ($USE_PAGED_MODE) {
- print "DEBUG: Use PAGED_MODE
" if $debug;
+ debug( "Use PAGED_MODE", 2 );
%params = %$params_def;
foreach (keys %page_params) {
delete $params{$_};
@@ -86,7 +90,7 @@ sub parse_params {
foreach my $param ( keys %params ) {
- print "
DEBUG: Param $param
" if $debug;
+ debug( "Param $param", 2 );
my $p_value_orig = $cgi->param($param);
@@ -94,18 +98,17 @@ sub parse_params {
&& defined $params_def->{$param}{alias}
&& defined $cgi->param($params_def->{$param}{alias})) {
$p_value_orig = $cgi->param($params_def->{$param}{alias});
- print "DEBUG: Used alias $params_def->{$param}{alias}
"
- if $debug;
+ debug( "Used alias $params_def->{$param}{alias}",
+ 2 );
}
my @p_value = ($p_value_orig);
- print "DEBUG: Value (Orig) ".($p_value_orig||"")."
" if $debug;
+ debug( "Value (Orig) ".($p_value_orig||""), 2 );
if ($params_def->{$param}{array} && defined $p_value_orig) {
@p_value = split /$params_def->{$param}{array}/, $p_value_orig;
- print "DEBUG: Value (Array Split) ".
- join('##',@p_value)."
" if $debug;
+ debug( "Value (Array Split) ". join('##',@p_value), 2 );
}
if ($params_def->{$param}{match} && defined $p_value_orig) {
@@ -115,8 +118,7 @@ sub parse_params {
}
@p_value = grep { defined $_ } @p_value;
- print "DEBUG: Value (Match) ".
- join('##',@p_value)."
" if $debug;
+ debug( "Value (Match) ". join('##',@p_value), 2 );
unless (@p_value) {
if (defined $params{$param}{default}) {
@@ -128,14 +130,14 @@ sub parse_params {
}
}
- print "DEBUG: Value (Default) ".
- join('##',@p_value)."
" if $debug;
+ debug( "Value (Default) ". join('##',@p_value), 2 );
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) {
@@ -150,8 +152,7 @@ sub parse_params {
}
}
- print "DEBUG: Value (Final) ".
- join('##',@p_value)."
" if $debug;
+ debug( "Value (Final) ". join('##',@p_value), 2 );
if ($params_def->{$param}{array}) {
$params_ret{values}{$param} = {
@@ -196,9 +197,11 @@ sub start {
sub end {
my $params = shift;
- my $page = $params->{values}{page}{final}
+ use Data::Dumper;
+ debug( "end: ".Dumper($params) );
+ my $page = $params->{page}
|| DEFAULT_PAGE;
- my $res_per_page = $params->{values}{number}{final}
+ my $res_per_page = $params->{number}
|| DEFAULT_RES_PER_PAGE;
return $page * $res_per_page;
@@ -208,9 +211,9 @@ sub indexline {
my ($cgi, $params, $num_res) = @_;
my $index_line = "";
- my $page = $params->{values}{page}{final}
+ my $page = $params->{page}
|| DEFAULT_PAGE;
- my $res_per_page = $params->{values}{number}{final}
+ my $res_per_page = $params->{number}
|| DEFAULT_RES_PER_PAGE;
my $numpages = ceil($num_res /
$res_per_page);
@@ -232,10 +235,10 @@ sub indexline {
sub nextlink {
my ($cgi, $params, $no_results ) = @_;
- my $page = $params->{values}{page}{final}
+ my $page = $params->{page}
|| DEFAULT_PAGE;
$page++;
- my $res_per_page = $params->{values}{number}{final}
+ my $res_per_page = $params->{number}
|| DEFAULT_RES_PER_PAGE;
if ((($page-1)*$res_per_page + 1) > $no_results) {
@@ -249,14 +252,14 @@ sub nextlink {
sub prevlink {
my ($cgi, $params ) = @_;
- my $page = $params->{values}{page}{final}
+ my $page = $params->{page}
|| DEFAULT_PAGE;
$page--;
if (!$page) {
return "<<";
}
- my $res_per_page = $params->{values}{number}{final}
+ my $res_per_page = $params->{number}
|| DEFAULT_RES_PER_PAGE;
return "self_url).
@@ -277,5 +280,230 @@ sub resperpagelink {
"&page=$page&number=$res_per_page\">$res_per_page";
}
+sub printindexline {
+ my ( $input, $no_results, $opts ) = @_;
+
+ my $index_line;
+ if ($no_results > $opts->{number}) {
+
+ $index_line = prevlink( $input, $opts)." | ".
+ indexline( $input, $opts, $no_results)." | ".
+ nextlink( $input, $opts, $no_results);
+
+ print "
$index_line
"; + } +} + +#sub multipageheader { +# my ( $input, $no_results, $opts ) = @_; +# +# my ($start, $end); +# if ($opts->{number} =~ /^all$/i) { +# $start = 1; +# $end = $no_results; +# $opts->{number} = $no_results; +# $opts->{number_all}++; +# } else { +# $start = Packages::Search::start( $opts ); +# $end = Packages::Search::end( $opts ); +# if ($end > $no_results) { $end = $no_results; } +# } +# +# print "Found $no_results matching packages,"; +# if ($end == $start) { +# print " displaying package $end.
"; +# } else { +# print " displaying packages $start to $end."; +# } +# +# printindexline( $input, $no_results, $opts ); +# +# if ($no_results > 100) { +# print "Results per page: "; +# my @resperpagelinks; +# for (50, 100, 200) { +# if ($opts->{number} == $_) { +# push @resperpagelinks, $_; +# } else { +# push @resperpagelinks, resperpagelink($input,$opts,$_); +# } +# } +# if ($opts->{number_all}) { +# push @resperpagelinks, "all"; +# } else { +# push @resperpagelinks, resperpagelink($input, $opts, "all"); +# } +# print join( " | ", @resperpagelinks )."
"; +# } +# return ( $start, $end ); +#} + +sub read_entry_all { + my ($hash, $key, $results, $non_results, $opts) = @_; + my $result = $hash->{$key} || ''; + 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); + push @$results, [ $key, @data ]; + } else { + push @$non_results, [ $key, @data ]; + } + } +} +sub read_entry { + my ($hash, $key, $results, $opts) = @_; + my @non_results; + read_entry_all( $hash, $key, $results, \@non_results, $opts ); +} +sub read_entry_simple { + my ($hash, $key, $archives, $suite) = @_; + my $result = $hash->{$key} || ''; + debug( "read_entry_simple: key=$key, archives=". + join(" ",(keys %$archives)).", suite=$suite", 1); + 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]} + && ($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; + } + } + } + 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) = @_; + my $result = $hash->{$key} || ''; + debug( "read_src_entry_all: key=$key", 1); + foreach (split /\000/o, $result) { + my @data = split ( /\s/o, $_, 6 ); + debug( "Considering entry ".join( ':', @data), 2); + if ($opts->{h_archives}{$data[0]} + && $opts->{h_suites}{$data[1]} + && $opts->{h_sections}{$data[2]}) { + debug( "Using entry ".join( ':', @data), 2); + push @$results, [ $key, @data ]; + } else { + push @$non_results, [ $key, @data ]; + } + } +} +sub read_src_entry { + my ($hash, $key, $results, $opts) = @_; + my @non_results; + read_src_entry_all( $hash, $key, $results, \@non_results, $opts ); +} +sub do_names_search { + my ($keyword, $packages, $postfixes, $read_entry, $opts, + $results, $non_results) = @_; + + $keyword = lc $keyword; + + my ($key, $prefixes) = ($keyword, ''); + my %pkgs; + $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) { + $_ = '' if $_ eq '^'; + debug( "add word $_$key", 2); + $pkgs{$_.$key}++; + } + } + last if $postfixes->seq( $key, $prefixes, R_NEXT ) != 0; + last if $too_many_hits or keys %pkgs >= 100; + } + + my $no_results = keys %pkgs; + if ($too_many_hits || ($no_results >= 100)) { + $too_many_hits += $no_results; + %pkgs = ( $keyword => 1 ); + } + foreach my $pkg (sort keys %pkgs) { + &$read_entry( $packages, $pkg, $results, $non_results, $opts ); + } +} +sub do_fulltext_search { + my ($keyword, $file, $did2pkg, $packages, $read_entry, $opts, + $results, $non_results) = @_; + +# NOTE: this needs to correspond with parse-packages! + $keyword =~ tr [A-Z] [a-z]; + if ($opts->{exact}) { + $keyword = " $keyword "; + } + $keyword =~ s/[(),.-]+//og; + $keyword =~ s#[^a-z0-9_/+]+# #og; + + my $numres = 0; + my %tmp_results; + # fgrep is seriously faster than using perl + open DESC, '-|', 'fgrep', '-n', '--', $keyword, $file + or die "couldn't open $file: $!"; + while (