Return-Path: X-Original-To: apmail-couchdb-commits-archive@www.apache.org Delivered-To: apmail-couchdb-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 5539911240 for ; Fri, 1 Aug 2014 09:05:43 +0000 (UTC) Received: (qmail 88914 invoked by uid 500); 1 Aug 2014 09:05:38 -0000 Delivered-To: apmail-couchdb-commits-archive@couchdb.apache.org Received: (qmail 88789 invoked by uid 500); 1 Aug 2014 09:05:38 -0000 Mailing-List: contact commits-help@couchdb.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@couchdb.apache.org Delivered-To: mailing list commits@couchdb.apache.org Received: (qmail 88748 invoked by uid 99); 1 Aug 2014 09:05:38 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 01 Aug 2014 09:05:38 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id D821E9BC9A6; Fri, 1 Aug 2014 09:05:37 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: rnewson@apache.org To: commits@couchdb.apache.org Date: Fri, 01 Aug 2014 09:05:41 -0000 Message-Id: <1bf7b0aeaf134f6ca1cb637764440a09@git.apache.org> In-Reply-To: <43199eadd1da472cb38a627f6bbae6bf@git.apache.org> References: <43199eadd1da472cb38a627f6bbae6bf@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [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 Authored: Sat Apr 6 21:52:58 2013 -0400 Committer: Robert Newson 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),