From 62395935e7bdd8e67776ebb9018f4633e67ff081 Mon Sep 17 00:00:00 2001
From: Eric Wong <e@80x24.org>
Date: Fri, 21 Aug 2015 23:43:12 +0000
Subject: search: s/count/total/ for results

This is hopefully less ambiguous, as the word "count" confused
me, too.
---
 lib/PublicInbox/Search.pm |  4 ++--
 lib/PublicInbox/View.pm   |  2 +-
 t/search.t                | 10 +++++-----
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/lib/PublicInbox/Search.pm b/lib/PublicInbox/Search.pm
index f1ff3a4b..580b79fc 100644
--- a/lib/PublicInbox/Search.pm
+++ b/lib/PublicInbox/Search.pm
@@ -242,7 +242,7 @@ sub get_thread {
 	my ($self, $mid, $opts) = @_;
 	my $smsg = eval { $self->lookup_message($mid) };
 
-	return { count => 0, msgs => [] } unless $smsg;
+	return { total => 0, msgs => [] } unless $smsg;
 	my $qp = $self->qp;
 	my $qtid = $qp->parse_query('thread:'.$smsg->thread_id);
 	my $qsub = $qp->parse_query('path:'.mid_compressed($smsg->path));
@@ -267,7 +267,7 @@ sub do_enquire {
 		PublicInbox::SearchMsg->load_doc($_->get_document);
 	} $mset->items;
 
-	{ count => $mset->get_matches_estimated, msgs => \@msgs }
+	{ total => $mset->get_matches_estimated, msgs => \@msgs }
 }
 
 # read-write
diff --git a/lib/PublicInbox/View.pm b/lib/PublicInbox/View.pm
index 4ed5344e..8105affe 100644
--- a/lib/PublicInbox/View.pm
+++ b/lib/PublicInbox/View.pm
@@ -438,7 +438,7 @@ sub html_footer {
 		$idx = " <a\nhref=\"../t/$mid.html$t_anchor\">".
 		       "threadlink</a>$idx";
 		my $res = $srch->get_followups($mid);
-		if (my $c = $res->{count}) {
+		if (my $c = $res->{total}) {
 			$c = $c == 1 ? '1 followup' : "$c followups";
 			$idx .= "\n$c:\n";
 			$res->{srch} = $srch;
diff --git a/t/search.t b/t/search.t
index 55abe9e8..89a28629 100644
--- a/t/search.t
+++ b/t/search.t
@@ -73,7 +73,7 @@ sub filter_mids {
 
 	foreach my $p (qw(hello hello_ hello_world2 hello_world_)) {
 		$res = $ro->query("path:$p");
-		is($res->{count}, 0, "path variant `$p' does not match");
+		is($res->{total}, 0, "path variant `$p' does not match");
 	}
 
 	$res = $ro->query('subject:(Hello world)');
@@ -100,7 +100,7 @@ sub filter_mids {
 		is_deeply(\@res, [ 'last@s' ],
 			  "got expected results for $f: match");
 		$res = $ro->query($f . ':root');
-		is($res->{count}, 0, "no partial mid match");
+		is($res->{total}, 0, "no partial mid match");
 	}
 }
 
@@ -204,7 +204,7 @@ sub filter_mids {
 	$rw_commit->();
 	$ro->reopen;
 	my $t = $ro->get_thread('root@s');
-	is($t->{count}, 4, "got all 4 mesages in thread");
+	is($t->{total}, 4, "got all 4 mesages in thread");
 	my @exp = sort($long_reply_mid, 'root@s', 'last@s', $long_midc);
 	@res = filter_mids($t);
 	is_deeply(\@res, \@exp, "get_thread works");
@@ -233,12 +233,12 @@ sub filter_mids {
 		],
 		body => "theatre\nfade\n"));
 	my $res = $rw->query("theatre");
-	is($res->{count}, 2, "got both matches");
+	is($res->{total}, 2, "got both matches");
 	is($res->{msgs}->[0]->mid, 'nquote@a', "non-quoted scores higher");
 	is($res->{msgs}->[1]->mid, 'quote@a', "quoted result still returned");
 
 	$res = $rw->query("illusions");
-	is($res->{count}, 1, "got a match for quoted text");
+	is($res->{total}, 1, "got a match for quoted text");
 	is($res->{msgs}->[0]->mid, 'quote@a',
 		"quoted result returned if nothing else");
 }
-- 
cgit v1.2.3-24-ge0c7