www: use Inbox->over where appropriate

[public-inbox.git] / lib / PublicInbox / Search.pm

diff --git a/lib/PublicInbox/Search.pm b/lib/PublicInbox/Search.pm
index 69eca9fed05a6ea94b0b1ac80d97c0b4d9d78c4b..e79ec0f80a0ead18b122108220bd6b1b80c13757 100644 (file)
--- a/lib/PublicInbox/Search.pm
+++ b/lib/PublicInbox/Search.pm
@@ -20,7 +20,6 @@ use PublicInbox::Over;
 
 # This is English-only, everything else is non-standard and may be confused as
 # a prefix common in patch emails
-our $REPLY_RE = qr/^re:\s+/i;
 our $LANG = 'english';
 
 use constant {
@@ -50,6 +49,9 @@ use constant {
 
 my %bool_pfx_external = (
        mid => 'Q', # Message-ID (full/exact), this is mostly uniQue
+       dfpre => 'XDFPRE',
+       dfpost => 'XDFPOST',
+       dfblob => 'XDFPRE XDFPOST',
 );
 
 my $non_quoted_body = 'XNQ XDFN XDFA XDFB XDFHH XDFCTX XDFPRE XDFPOST';
@@ -74,9 +76,6 @@ my %prob_prefix = (
        dfb => 'XDFB',
        dfhh => 'XDFHH',
        dfctx => 'XDFCTX',
-       dfpre => 'XDFPRE',
-       dfpost => 'XDFPOST',
-       dfblob => 'XDFPRE XDFPOST',
 
        # default:
        '' => 'XM S A XQUOT XFN ' . $non_quoted_body,
@@ -182,11 +181,6 @@ sub query {
        }
 }
 
-sub get_thread {
-       my ($self, $mid, $prev) = @_;
-       $self->{over_ro}->get_thread($mid, $prev);
-}
-
 sub retry_reopen {
        my ($self, $cb) = @_;
        for my $i (1..10) {
@@ -266,7 +260,7 @@ sub qp {
                Search::Xapian::NumberValueRangeProcessor->new(DT, 'dt:'));
 
        while (my ($name, $prefix) = each %bool_pfx_external) {
-               $qp->add_boolean_prefix($name, $prefix);
+               $qp->add_boolean_prefix($name, $_) foreach split(/ /, $prefix);
        }
 
        # we do not actually create AltId objects,
@@ -293,46 +287,11 @@ EOF
        $self->{query_parser} = $qp;
 }
 
-# only used for NNTP server
-sub query_xover {
-       my ($self, $beg, $end, $offset) = @_;
-       $self->{over_ro}->query_xover($beg, $end, $offset);
-}
-
-sub query_ts {
-       my ($self, $ts, $prev) = @_;
-       $self->{over_ro}->query_ts($ts, $prev);
-}
-
 sub lookup_article {
        my ($self, $num) = @_;
        $self->{over_ro}->get_art($num);
 }
 
-sub next_by_mid {
-       my ($self, $mid, $id, $prev) = @_;
-       $self->{over_ro}->next_by_mid($mid, $id, $prev);
-}
-
-# normalize subjects so they are suitable as pathnames for URLs
-# XXX: consider for removal
-sub subject_path {
-       my $subj = pop;
-       $subj = subject_normalized($subj);
-       $subj =~ s![^a-zA-Z0-9_\.~/\-]+!_!g;
-       lc($subj);
-}
-
-sub subject_normalized {
-       my $subj = pop;
-       $subj =~ s/\A\s+//s; # no leading space
-       $subj =~ s/\s+\z//s; # no trailing space
-       $subj =~ s/\s+/ /gs; # no redundant spaces
-       $subj =~ s/\.+\z//; # no trailing '.'
-       $subj =~ s/$REPLY_RE//igo; # remove reply prefix
-       $subj;
-}
-
 sub help {
        my ($self) = @_;
        $self->qp; # parse altids