You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by ja...@apache.org on 2017/11/01 07:02:59 UTC
[couchdb] 03/07: Reduce duplicated code
This is an automated email from the ASF dual-hosted git repository.
jan pushed a commit to branch 1.x.x
in repository https://gitbox.apache.org/repos/asf/couchdb.git
commit 4642d66db3ccffa2bef71609a5040d2c7746ec1e
Author: Alexander Shorin <kx...@apache.org>
AuthorDate: Sat Dec 12 21:01:05 2015 +0300
Reduce duplicated code
---
src/couch_mrview/src/couch_mrview_show.erl | 20 ++++----------------
1 file changed, 4 insertions(+), 16 deletions(-)
diff --git a/src/couch_mrview/src/couch_mrview_show.erl b/src/couch_mrview/src/couch_mrview_show.erl
index 3e0e743..d8e6edb 100644
--- a/src/couch_mrview/src/couch_mrview_show.erl
+++ b/src/couch_mrview/src/couch_mrview_show.erl
@@ -331,22 +331,10 @@ apply_etag({ExternalResponse}, CurrentEtag) ->
% headers on the JsonResponse object. We need to control the Etag and
% Vary headers. If the external function controls the Etag, we'd have to
% run it to check for a match, which sort of defeats the purpose.
- case couch_util:get_value(<<"headers">>, ExternalResponse, nil) of
- nil ->
- % no JSON headers
- % add our Etag and Vary headers to the response
- {[{<<"headers">>, {[{<<"Etag">>, CurrentEtag}, {<<"Vary">>, <<"Accept">>}]}} | ExternalResponse]};
- JsonHeaders ->
- {[case Field of
- {<<"headers">>, JsonHeaders} -> % add our headers
- JsonHeadersEtagged = json_apply_field({<<"Etag">>, CurrentEtag}, JsonHeaders),
- JsonHeadersVaried = json_apply_field({<<"Vary">>, <<"Accept">>}, JsonHeadersEtagged),
- {<<"headers">>, JsonHeadersVaried};
- _ -> % skip non-header fields
- Field
- end || Field <- ExternalResponse]}
- end.
-
+ apply_headers(ExternalResponse, [
+ {<<"Etag">>, CurrentEtag},
+ {<<"Vary">>, <<"Accept">>}
+ ]).
apply_headers(JsonResp, []) ->
JsonResp;
--
To stop receiving notification emails like this one, please contact
"commits@couchdb.apache.org" <co...@couchdb.apache.org>.