You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by rn...@apache.org on 2014/08/01 11:05:41 UTC
[05/49] chttpd commit: updated refs/heads/windsor-merge to 554ef74
Remove trailing whitespace in chttpd_show
Project: http://git-wip-us.apache.org/repos/asf/couchdb-chttpd/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-chttpd/commit/1e0c52a7
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-chttpd/tree/1e0c52a7
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-chttpd/diff/1e0c52a7
Branch: refs/heads/windsor-merge
Commit: 1e0c52a77d963661ba64ff03b99351a0c414c1a2
Parents: 7932e0c
Author: Michael Rhodes <mi...@gmail.com>
Authored: Sat Apr 6 21:52:58 2013 -0400
Committer: Robert Newson <rn...@apache.org>
Committed: Tue Jul 29 17:11:34 2014 +0100
----------------------------------------------------------------------
src/chttpd_show.erl | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb-chttpd/blob/1e0c52a7/src/chttpd_show.erl
----------------------------------------------------------------------
diff --git a/src/chttpd_show.erl b/src/chttpd_show.erl
index 9db4d07..7dc5337 100644
--- a/src/chttpd_show.erl
+++ b/src/chttpd_show.erl
@@ -18,7 +18,7 @@
-include_lib("couch_mrview/include/couch_mrview.hrl").
% /db/_design/foo/_show/bar/docid
-% show converts a json doc to a response of any content-type.
+% show converts a json doc to a response of any content-type.
% it looks up the doc an then passes it to the query server.
% then it sends the response from the query server to the http client.
@@ -44,7 +44,7 @@ handle_doc_show_req(#httpd{
handle_doc_show_req(#httpd{
path_parts=[_, _, _, _, ShowName, DocId|Rest]
}=Req, Db, DDoc) ->
-
+
DocParts = [DocId|Rest],
DocId1 = ?l2b(string:join([?b2l(P)|| P <- DocParts], "/")),
@@ -75,7 +75,7 @@ handle_doc_show(Req, Db, DDoc, ShowName, Doc, DocId) ->
chttpd:etag_respond(Req, CurrentEtag, fun() ->
JsonReq = chttpd_external:json_req_obj(Req, Db, DocId),
JsonDoc = couch_query_servers:json_doc(Doc),
- [<<"resp">>, ExternalResp] =
+ [<<"resp">>, ExternalResp] =
couch_query_servers:ddoc_prompt(DDoc, [<<"shows">>, ShowName],
[JsonDoc, JsonReq]),
JsonResp = apply_etag(ExternalResp, CurrentEtag),