user/dev discussion of public-inbox itself
 help / color / mirror / code / Atom feed
From: Eric Wong <e@80x24.org>
To: meta@public-inbox.org
Subject: [PATCH] www_listing: drop "sort options + mbox downloads" bit
Date: Wed, 14 Dec 2022 22:34:15 +0000	[thread overview]
Message-ID: <20221214223415.23007-1-e@80x24.org> (raw)

The sort options and mbox downloads only apply to individual
inbox search endpoints, and they make no sense for the listing
of inboxes themselves.
---
 lib/PublicInbox/SearchView.pm | 13 +++++++------
 lib/PublicInbox/WwwListing.pm |  2 +-
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/lib/PublicInbox/SearchView.pm b/lib/PublicInbox/SearchView.pm
index 8932c73d..aeee2a2a 100644
--- a/lib/PublicInbox/SearchView.pm
+++ b/lib/PublicInbox/SearchView.pm
@@ -134,7 +134,7 @@ sub mset_summary {
 		$q->{-min_pct} = $min;
 		$q->{-max_pct} = $max;
 	}
-	$$res .= search_nav_bot($mset, $q);
+	$$res .= search_nav_bot($ctx, $mset, $q);
 	undef;
 }
 
@@ -225,7 +225,7 @@ EOM
 }
 
 sub search_nav_bot { # also used by WwwListing for searching extindex miscidx
-	my ($mset, $q) = @_;
+	my ($ctx, $mset, $q) = @_;
 	my $total = $mset->get_matches_estimated;
 	my $l = $q->{l};
 	my $rv = '</pre><hr><pre id=t>';
@@ -274,9 +274,10 @@ sub search_nav_bot { # also used by WwwListing for searching extindex miscidx
 	$rv .= qq{<a\nhref="?$prev"\nrel=prev>prev $pd</a>} if $prev;
 
 	my $rev = $q->qs_html(o => $o < 0 ? 0 : -1);
-	$rv .= qq{ | <a\nhref="?$rev">reverse</a>} .
-		q{ | sort options + mbox downloads } .
-		q{<a href=#d>above</a></pre>};
+	$rv .= qq{ | <a\nhref="?$rev">reverse</a>};
+	exists($ctx->{ibx}) and
+		$rv .= q{ | sort options + mbox downloads <a href=#d>above</a></pre>};
+	$rv;
 }
 
 sub sort_relevance {
@@ -301,7 +302,7 @@ sub mset_thread {
 	my $rootset = PublicInbox::SearchThread::thread($msgs,
 		$r ? \&sort_relevance : \&PublicInbox::View::sort_ds,
 		$ctx);
-	my $skel = search_nav_bot($mset, $q).
+	my $skel = search_nav_bot($ctx, $mset, $q).
 		"<pre>-- links below jump to the message on this page --\n";
 
 	$ctx->{-upfx} = '';
diff --git a/lib/PublicInbox/WwwListing.pm b/lib/PublicInbox/WwwListing.pm
index 72c940dd..21e5b8bc 100644
--- a/lib/PublicInbox/WwwListing.pm
+++ b/lib/PublicInbox/WwwListing.pm
@@ -162,7 +162,7 @@ sub mset_footer ($$) {
 	# no footer if too few matches
 	return '' if $mset->get_matches_estimated == $mset->size;
 	require PublicInbox::SearchView;
-	PublicInbox::SearchView::search_nav_bot($mset, $ctx->{-sq});
+	PublicInbox::SearchView::search_nav_bot($ctx, $mset, $ctx->{-sq});
 }
 
 sub mset_nav_top {

                 reply	other threads:[~2022-12-14 22:34 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

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=20221214223415.23007-1-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).