commit c3bed460ee844175b8ce11081386be27f686d8ff
author Alexander Shorin <kxepal@apache.org> Thu Oct 22 23:22:58 2015 +0300
committer Alexander Shorin <kxepal@apache.org> Tue Nov 10 02:38:24 2015 +0300
tree 98485bfe187a294a43b9820995827c0683e3a894
parent 0334f690c5ccc16ea0284d9c2f2b58c77f1fc2b9

Reduce duplicated code

src/couch_mrview_show.erl

diff --git a/src/couch_mrview_show.erl b/src/couch_mrview_show.erl
index 3c38c71..5a01b84 100644
--- a/src/couch_mrview_show.erl
+++ b/src/couch_mrview_show.erl
@@ -322,21 +322,10 @@
     % 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;