search: replace ->query with ->mset

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

diff --git a/lib/PublicInbox/ExtMsg.pm b/lib/PublicInbox/ExtMsg.pm
index 0f3e392defcf09cf2aa453001268b22e867adc6a..5dffc65c9150f04db7ad2bde10c9921fc95075fd 100644 (file)
--- a/lib/PublicInbox/ExtMsg.pm
+++ b/lib/PublicInbox/ExtMsg.pm
@@ -1,4 +1,4 @@
-# Copyright (C) 2015-2019 all contributors <meta@public-inbox.org>
+# Copyright (C) 2015-2020 all contributors <meta@public-inbox.org>
 # License: AGPL-3.0+ <https://www.gnu.org/licenses/agpl-3.0.txt>
 #
 # Used by the web interface to link to messages outside of the our
@@ -8,9 +8,9 @@
 package PublicInbox::ExtMsg;
 use strict;
 use warnings;
-use PublicInbox::Hval qw/ascii_html/;
-use PublicInbox::MID qw/mid2path/;
-use PublicInbox::WwwStream;
+use PublicInbox::Hval qw(ascii_html prurl mid_href);
+use PublicInbox::WwwStream qw(html_oneshot);
+use PublicInbox::Smsg;
 our $MIN_PARTIAL_LEN = 16;
 
 # TODO: user-configurable
@@ -18,7 +18,7 @@ our @EXT_URL = map { ascii_html($_) } (
        # leading "//" denotes protocol-relative (http:// or https://)
        '//marc.info/?i=%s',
        '//www.mail-archive.com/search?l=mid&q=%s',
-       'nntp://news.gmane.org/%s',
+       'nntp://news.gmane.io/%s',
        'https://lists.debian.org/msgid-search/%s',
        '//docs.FreeBSD.org/cgi/mid.cgi?db=mid&id=%s',
        'https://www.w3.org/mid/%s',
@@ -29,13 +29,10 @@ our @EXT_URL = map { ascii_html($_) } (
 
 sub PARTIAL_MAX () { 100 }
 
-sub mids_from_mset { # Search::retry_reopen callback
-       [ map { PublicInbox::SearchMsg::from_mitem($_)->mid } $_[0]->items ];
-}
-
 sub search_partial ($$) {
-       my ($srch, $mid) = @_;
+       my ($ibx, $mid) = @_;
        return if length($mid) < $MIN_PARTIAL_LEN;
+       my $srch = $ibx->search or return;
        my $opt = { limit => PARTIAL_MAX, mset => 2 };
        my @try = ("m:$mid*");
        my $chop = $mid;
@@ -68,9 +65,11 @@ sub search_partial ($$) {
                # has too many results.  $@ can be
                # Search::Xapian::QueryParserError or even:
                # "something terrible happened at ../Search/Xapian/Enquire.pm"
-               my $mset = eval { $srch->query($m, $opt) } or next;
-               my $mids = $srch->retry_reopen(\&mids_from_mset, $mset);
-               return $mids if scalar(@$mids);
+               my $mset = eval { $srch->mset($m, $opt) } or next;
+               my @mids = map {
+                       $_->{mid}
+               } @{$srch->mset_to_smsg($ibx, $mset)};
+               return \@mids if scalar(@mids);
        }
 }
 
@@ -111,8 +110,7 @@ sub ext_msg {
        # fall back to partial MID matching
        my @partial;
        my $n_partial = 0;
-       my $srch = $cur->search;
-       my $mids = search_partial($srch, $mid) if $srch;
+       my $mids = search_partial($cur, $mid);
        if ($mids) {
                $n_partial = scalar(@$mids);
                push @partial, [ $cur, $mids ];
@@ -121,8 +119,7 @@ sub ext_msg {
        # can't find a partial match in current inbox, try the others:
        if (!$n_partial && length($mid) >= $MIN_PARTIAL_LEN) {
                foreach my $ibx (@$ibxs) {
-                       $srch = $ibx->search or next;
-                       $mids = search_partial($srch, $mid) or next;
+                       $mids = search_partial($ibx, $mid) or next;
                        $n_partial += scalar(@$mids);
                        push @partial, [ $ibx, $mids];
                        last if $n_partial >= PARTIAL_MAX;
@@ -130,9 +127,8 @@ sub ext_msg {
        }
 
        my $code = 404;
-       my $h = PublicInbox::Hval->new_msgid($mid);
-       my $href = $h->{href};
-       my $html = $h->as_html;
+       my $href = mid_href($mid);
+       my $html = ascii_html($mid);
        my $title = "&lt;$html&gt; not found";
        my $s = "<pre>Message-ID &lt;$html&gt;\nnot found\n";
        if ($n_partial) {
@@ -146,10 +142,9 @@ sub ext_msg {
                        my $env = $ctx->{env} if $ibx->{name} eq $cur_name;
                        my $u = $ibx->base_url($env) or next;
                        foreach my $m (@$res) {
-                               my $p = PublicInbox::Hval->new_msgid($m);
-                               my $r = $p->{href};
-                               my $t = $p->as_html;
-                               $s .= qq{<a\nhref="$u$r/">$u$t/</a>\n};
+                               my $href = mid_href($m);
+                               my $html = ascii_html($m);
+                               $s .= qq{<a\nhref="$u$href/">$u$html/</a>\n};
                        }
                }
        }
@@ -161,7 +156,7 @@ sub ext_msg {
        $ctx->{-html_tip} = $s .= '</pre>';
        $ctx->{-title_html} = $title;
        $ctx->{-upfx} = '../';
-       PublicInbox::WwwStream->response($ctx, $code);
+       html_oneshot($ctx, $code);
 }
 
 sub ext_urls {
@@ -172,7 +167,7 @@ sub ext_urls {
                my $env = $ctx->{env};
                my $e = "\nPerhaps try an external site:\n\n";
                foreach my $url (@EXT_URL) {
-                       my $u = PublicInbox::Hval::prurl($env, $url);
+                       my $u = prurl($env, $url);
                        my $r = sprintf($u, $href);
                        my $t = sprintf($u, $html);
                        $e .= qq{<a\nhref="$r">$t</a>\n};
@@ -184,9 +179,8 @@ sub ext_urls {
 
 sub exact {
        my ($ctx, $found, $mid) = @_;
-       my $h = PublicInbox::Hval->new_msgid($mid);
-       my $href = $h->{href};
-       my $html = $h->as_html;
+       my $href = mid_href($mid);
+       my $html = ascii_html($mid);
        my $title = "&lt;$html&gt; found in ";
        my $end = @$found == 1 ? 'another inbox' : 'other inboxes';
        $ctx->{-title_html} = $title . $end;
@@ -200,7 +194,7 @@ sub exact {
                                        qq(<a\nhref="$u$href/">$u$html/</a>\n)
                                } @$found),
                        $ext_urls, '</pre>');
-       PublicInbox::WwwStream->response($ctx, $code);
+       html_oneshot($ctx, $code);
 }
 
 1;