From: Eric Wong <e@80x24.org>
To: meta@public-inbox.org
Subject: [PATCH 1/6] searchview: factor out dump_mset subroutine
Date: Sat, 5 Sep 2015 09:01:03 +0000 [thread overview]
Message-ID: <1441443668-21092-2-git-send-email-e@80x24.org> (raw)
In-Reply-To: <1441443668-21092-1-git-send-email-e@80x24.org>
We'll be moving atom and thread display support inline
and reducing endpoints. Maybe it makes sense, maybe not.
---
lib/PublicInbox/SearchView.pm | 41 ++++++++++++++++++++---------------------
1 file changed, 20 insertions(+), 21 deletions(-)
diff --git a/lib/PublicInbox/SearchView.pm b/lib/PublicInbox/SearchView.pm
index 4d49d25..960049f 100644
--- a/lib/PublicInbox/SearchView.pm
+++ b/lib/PublicInbox/SearchView.pm
@@ -49,23 +49,7 @@ sub sres_top_html {
}
$res .= "]\n\n";
- my $pad = length("$total");
- my $pfx = ' ' x $pad;
- foreach my $m ($mset->items) {
- my $rank = sprintf("%${pad}d", $m->get_rank + 1);
- my $pct = $m->get_percent;
- my $smsg = $m->get_document;
- $smsg = PublicInbox::SearchMsg->load_doc($smsg);
- my $s = PublicInbox::Hval->new_oneline($smsg->subject);
- my $f = $smsg->from_name;
- $f = PublicInbox::Hval->new_oneline($f)->as_html;
- my $d = strftime('%Y-%m-%d %H:%M', gmtime($smsg->ts));
- my $mid = $smsg->mid;
- $mid = PublicInbox::Hval->new_msgid($mid)->as_href;
- $res .= qq{$rank. <b><a\nhref="$mid/t/#u">}.
- $s->as_html . "</a></b>\n";
- $res .= "$pfx - by $f @ $d UTC [$pct%]\n\n";
- }
+ dump_mset(\$res, $mset);
my $nr = scalar $mset->items;
my $end = $o + $nr;
my $beg = $o + 1;
@@ -86,17 +70,32 @@ sub sres_top_html {
$qp .= "&r" if $r;
$res .= qq{<a\nhref="?$qp">prev</a>};
}
- $res .= "\n\n".$foot;
+ $res .= "\n\n" . $foot;
}
$res .= "</pre></body></html>";
[200, ['Content-Type'=>'text/html; charset=UTF-8'], [$res]];
}
-sub sres_top_atom {
-}
+sub dump_mset {
+ my ($res, $mset) = @_;
-sub sres_top_thread {
+ my $total = $mset->get_matches_estimated;
+ my $pad = length("$total");
+ my $pfx = ' ' x $pad;
+ foreach my $m ($mset->items) {
+ my $rank = sprintf("%${pad}d", $m->get_rank + 1);
+ my $pct = $m->get_percent;
+ my $smsg = PublicInbox::SearchMsg->load_doc($m->get_document);
+ my $s = PublicInbox::Hval->new_oneline($smsg->subject);
+ my $f = $smsg->from_name;
+ $f = PublicInbox::Hval->new_oneline($f)->as_html;
+ my $d = strftime('%Y-%m-%d %H:%M', gmtime($smsg->ts));
+ my $mid = PublicInbox::Hval->new_msgid($smsg->mid)->as_href;
+ $$res .= qq{$rank. <b><a\nhref="$mid/t/#u">}.
+ $s->as_html . "</a></b>\n";
+ $$res .= "$pfx - by $f @ $d UTC [$pct%]\n\n";
+ }
}
1;
--
EW
next prev parent reply other threads:[~2015-09-05 9:01 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-09-05 9:01 [PATCH 0/6] another round of search updates Eric Wong
2015-09-05 9:01 ` Eric Wong [this message]
2015-09-05 9:01 ` [PATCH 2/6] search: use relevance as secondary sort by default Eric Wong
2015-09-05 9:01 ` [PATCH 3/6] searchview: error description for invalid queries Eric Wong
2015-09-05 9:01 ` [PATCH 4/6] search: note why we do not support FLAG_PURE_NOT Eric Wong
2015-09-05 9:01 ` [PATCH 5/6] search: tweak parsing for internal queries Eric Wong
2015-09-05 9:01 ` [PATCH 6/6] extmsg: fall back to partial Message-ID matching Eric Wong
2015-09-05 9:14 ` Eric Wong
2015-09-05 9:18 ` [PATCH] extmsg: add note about the deficiency of the implementation Eric Wong
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://public-inbox.org/README
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1441443668-21092-2-git-send-email-e@80x24.org \
--to=e@80x24.org \
--cc=meta@public-inbox.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/public-inbox.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).