nntp: inline CRLF in all response lines

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

diff --git a/lib/PublicInbox/MiscSearch.pm b/lib/PublicInbox/MiscSearch.pm
index 4e01045392886135fbb9d2f7aa1bebb90016be5c..c6d2a062a66865e8774aee9c8bee9ddf248c8db5 100644 (file)
--- a/lib/PublicInbox/MiscSearch.pm
+++ b/lib/PublicInbox/MiscSearch.pm
@@ -59,7 +59,7 @@ sub misc_enquire_once { # retry_reopen callback
        $eq->set_query($qr);
         my $desc = !$opt->{asc};
        my $rel = $opt->{relevance} // 0;
-       if ($rel == -1) { # ORDER BY docid/UID
+       if ($rel == -1) { # ORDER BY docid
                $eq->set_docid_order($PublicInbox::Search::ENQ_ASCENDING);
                $eq->set_weighting_scheme($PublicInbox::Search::X{BoolWeight}->new);
        } elsif ($rel) {
@@ -81,41 +81,6 @@ sub mset {
        retry_reopen($self, \&misc_enquire_once, $qr, $opt);
 }
 
-sub ibx_matches_once { # retry_reopen callback
-       my ($self, $qr, $by_newsgroup) = @_;
-       # double in case no newsgroups are configured:
-       my $limit = scalar(keys %$by_newsgroup) * 2;
-       my $opt = { limit => $limit, offset => 0, relevance => -1 };
-       my $ret = {}; # newsgroup => $ibx of matches
-       while (1) {
-               my $mset = misc_enquire_once($self, $qr, $opt);
-               for my $mi ($mset->items) {
-                       my ($eidx_key) = xap_terms('Q', $mi->get_document);
-                       if (defined($eidx_key)) {
-                               if (my $ibx = $by_newsgroup->{$eidx_key}) {
-                                       $ret->{$eidx_key} = $ibx;
-                               }
-                       } else {
-                               warn <<EOF;
-W: docid=${\$mi->get_docid} has no `Q' (eidx_key) term
-EOF
-                       }
-               }
-               my $nr = $mset->size;
-               return $ret if $nr < $limit;
-               $opt->{offset} += $nr;
-       }
-}
-
-# returns a newsgroup => PublicInbox::Inbox mapping
-sub newsgroup_matches {
-       my ($self, $qs, $pi_cfg) = @_;
-       my $qp = $self->{qp} //= mi_qp_new($self);
-       $qs .= ' type:inbox';
-       my $qr = $qp->parse_query($qs, $PublicInbox::Search::QP_FLAGS);
-       retry_reopen($self, \&ibx_matches_once, $qr, $pi_cfg->{-by_newsgroup});
-}
-
 sub ibx_data_once {
        my ($self, $ibx) = @_;
        my $xdb = $self->{xdb};
@@ -132,6 +97,23 @@ sub ibx_data_once {
        }
 }
 
+sub doc2ibx_cache_ent { # @_ == ($self, $doc) OR ($doc)
+       my ($doc) = $_[-1];
+       my $d;
+       my $data = $json->decode($doc->get_data);
+       for (values %$data) {
+               $d = $_->{description} // next;
+               $d =~ s/ \[epoch [0-9]+\]\z// or next;
+               last;
+       }
+       {
+               uidvalidity => int_val($doc, $UIDVALIDITY),
+               -modified => int_val($doc, $MODIFIED),
+               # extract description from manifest.js.gz epoch description
+               description => $d
+       };
+}
+
 sub inbox_data {
        my ($self, $ibx) = @_;
        retry_reopen($self, \&ibx_data_once, $ibx);
@@ -141,20 +123,7 @@ sub ibx_cache_load {
        my ($doc, $cache) = @_;
        my ($eidx_key) = xap_terms('Q', $doc);
        return unless defined($eidx_key); # expired
-       my $ce = $cache->{$eidx_key} = {};
-       $ce->{uidvalidity} = int_val($doc, $UIDVALIDITY);
-       $ce->{-modified} = int_val($doc, $MODIFIED);
-       $ce->{description} = do {
-               # extract description from manifest.js.gz epoch description
-               my $d;
-               my $data = $json->decode($doc->get_data);
-               for (values %$data) {
-                       $d = $_->{description} // next;
-                       $d =~ s/ \[epoch [0-9]+\]\z// or next;
-                       last;
-               }
-               $d;
-       }
+       $cache->{$eidx_key} = doc2ibx_cache_ent($doc);
 }
 
 sub _nntpd_cache_load { # retry_reopen callback