From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: X-Spam-Status: No, score=-2.9 required=3.0 tests=ALL_TRUSTED,AWL,BAYES_00 shortcircuit=no autolearn=unavailable version=3.3.2 X-Original-To: meta@public-inbox.org Received: from localhost (dcvr.yhbt.net [127.0.0.1]) by dcvr.yhbt.net (Postfix) with ESMTP id 3A460200F1 for ; Sat, 5 Sep 2015 09:01:11 +0000 (UTC) From: Eric Wong To: meta@public-inbox.org Subject: [PATCH 1/6] searchview: factor out dump_mset subroutine Date: Sat, 5 Sep 2015 09:01:03 +0000 Message-Id: <1441443668-21092-2-git-send-email-e@80x24.org> In-Reply-To: <1441443668-21092-1-git-send-email-e@80x24.org> References: <1441443668-21092-1-git-send-email-e@80x24.org> List-Id: 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. }. - $s->as_html . "\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{prev}; } - $res .= "\n\n".$foot; + $res .= "\n\n" . $foot; } $res .= ""; [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. }. + $s->as_html . "\n"; + $$res .= "$pfx - by $f @ $d UTC [$pct%]\n\n"; + } } 1; -- EW