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 7F8F11F6D4 for ; Sun, 13 Sep 2015 22:35:47 +0000 (UTC) From: Eric Wong To: meta@public-inbox.org Subject: [PATCH 2/3] searchview: implement Atom feed for search results Date: Sun, 13 Sep 2015 22:35:46 +0000 Message-Id: <20150913223547.5083-2-e@80x24.org> In-Reply-To: <20150913223547.5083-1-e@80x24.org> References: <20150913223547.5083-1-e@80x24.org> List-Id: This can be helpful for folks who want to subscribe to a particular topic or keyword. --- lib/PublicInbox/Feed.pm | 6 +++--- lib/PublicInbox/SearchView.pm | 42 +++++++++++++++++++++++++++++++++--------- 2 files changed, 36 insertions(+), 12 deletions(-) diff --git a/lib/PublicInbox/Feed.pm b/lib/PublicInbox/Feed.pm index 5a2f62b..85c598e 100644 --- a/lib/PublicInbox/Feed.pm +++ b/lib/PublicInbox/Feed.pm @@ -74,7 +74,7 @@ sub emit_atom { add_to_feed($feed_opts, $fh, $path, $git); }); $git = undef; # destroy pipes - _end_feed($fh); + end_feed($fh); } sub _no_thread { @@ -84,7 +84,7 @@ sub _no_thread { $fh->close; } -sub _end_feed { +sub end_feed { my ($fh) = @_; Email::Address->purge_cache; $fh->write(''); @@ -108,7 +108,7 @@ sub emit_atom_thread { add_to_feed($feed_opts, $fh, mid2path($msg->mid), $git); } $git = undef; # destroy pipes - _end_feed($fh); + end_feed($fh); } sub emit_html_index { diff --git a/lib/PublicInbox/SearchView.pm b/lib/PublicInbox/SearchView.pm index c15a046..b65351a 100644 --- a/lib/PublicInbox/SearchView.pm +++ b/lib/PublicInbox/SearchView.pm @@ -30,7 +30,7 @@ sub sres_top_html { $total = $mset->get_matches_estimated; }; my $err = $@; - my $res = html_start($q) . PublicInbox::View::PRE_WRAP; + my $res = html_start($q, $ctx) . PublicInbox::View::PRE_WRAP; if ($err) { $code = 400; $res .= err_txt($err) . "
" . foot($ctx);
@@ -39,8 +39,7 @@ sub sres_top_html {
 		$res .= "\n\n[No results found]
".foot($ctx);
 	} else {
 		my $x = $q->{x};
-		# TODO
-		#return sub { adump($_[0], $mset, $q, $ctx) } if ($x eq 'A');
+		return sub { adump($_[0], $mset, $q, $ctx) } if ($x eq 'A');
 
 		$res .= search_nav_top($mset, $q);
 		if ($x eq 't') {
@@ -109,8 +108,8 @@ sub search_nav_top {
 		$rv .= qq{summary|};
 		$rv .= qq{threaded};
 	}
-	# my $A = $q->qs_html(x => 'a');
-	# $rv .= qq{|Atom}; # TODO
+	my $A = $q->qs_html(x => 'A');
+	$rv .= qq{|Atom};
 	$rv .= ']';
 }
 
@@ -213,13 +212,16 @@ sub foot {
 }
 
 sub html_start {
-	my ($q) = @_;
+	my ($q, $ctx) = @_;
 	my $query = PublicInbox::Hval->new_oneline($q->{q});
 
 	my $qh = $query->as_html;
-	my $res = "$qh - search results" .
-		  qq{} .
-		  qq{};
+	my $A = $q->qs_html(x => 'A');
+	my $res = "$qh - search results" .
+		qq{! .
+		qq{} .
+		qq{};
 
 	$res .= qq{} if $q->{r};
 	if (my $x = $q->{x}) {
@@ -230,6 +232,28 @@ sub html_start {
 	$res .= qq{};
 }
 
+sub adump {
+	my ($cb, $mset, $q, $ctx) = @_;
+	my $fh = $cb->([ 200, ['Content-Type' => 'application/atom+xml']]);
+	require PublicInbox::GitCatFile;
+	my $git = PublicInbox::GitCatFile->new($ctx->{git_dir});
+	my $feed_opts = PublicInbox::Feed::get_feedopts($ctx);
+	my $x = PublicInbox::Hval->new_oneline($q->{q})->as_html;
+	$x = qq{$x - search results};
+	$feed_opts->{atomurl} = $feed_opts->{url} . '?'. $q->qs_html;
+	$feed_opts->{url} .= '?'. $q->qs_html(x => undef);
+	$x = PublicInbox::Feed::atom_header($feed_opts, $x);
+	$fh->write($x. PublicInbox::Feed::feed_updated());
+
+	for ($mset->items) {
+		$x = PublicInbox::SearchMsg->load_doc($_->get_document)->mid;
+		$x = mid2path($x);
+		PublicInbox::Feed::add_to_feed($feed_opts, $fh, $x, $git);
+	}
+	$git = undef;
+	PublicInbox::Feed::end_feed($fh);
+}
+
 package PublicInbox::SearchQuery;
 use strict;
 use warnings;
-- 
EW