couchdb-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kxe...@apache.org
Subject [04/11] chttpd commit: updated refs/heads/setup to 2398380
Date Wed, 28 Jan 2015 15:18:13 GMT
Re-indent to reflect recent addtion of a case branch

COUCHDB-2517


Project: http://git-wip-us.apache.org/repos/asf/couchdb-chttpd/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-chttpd/commit/c256e919
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-chttpd/tree/c256e919
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-chttpd/diff/c256e919

Branch: refs/heads/setup
Commit: c256e919220b298b7ab14074a68c1ff91bacf12a
Parents: 016ede4
Author: ILYA Khlopotov <iilyak@ca.ibm.com>
Authored: Mon Dec 8 07:46:46 2014 -0800
Committer: ILYA Khlopotov <iilyak@ca.ibm.com>
Committed: Mon Dec 15 12:22:33 2014 -0800

----------------------------------------------------------------------
 src/chttpd_db.erl | 52 +++++++++++++++++++++++++-------------------------
 1 file changed, 26 insertions(+), 26 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/couchdb-chttpd/blob/c256e919/src/chttpd_db.erl
----------------------------------------------------------------------
diff --git a/src/chttpd_db.erl b/src/chttpd_db.erl
index 79d832b..e4510ae 100644
--- a/src/chttpd_db.erl
+++ b/src/chttpd_db.erl
@@ -586,32 +586,32 @@ db_doc_req(#httpd{method='GET'}=Req, Db, DocId) ->
             [] when Revs == all ->
                 chttpd:send_error(Req, {not_found, missing});
             _Else ->
-        case lists:member("multipart/mixed", AcceptedTypes) of
-        false ->
-            {ok, Resp} = start_json_response(Req, 200),
-            send_chunk(Resp, "["),
-            % We loop through the docs. The first time through the separator
-            % is whitespace, then a comma on subsequent iterations.
-            lists:foldl(
-                fun(Result, AccSeparator) ->
-                    case Result of
-                    {ok, Doc} ->
-                        JsonDoc = couch_doc:to_json_obj(Doc, Options),
-                        Json = ?JSON_ENCODE({[{ok, JsonDoc}]}),
-                        send_chunk(Resp, AccSeparator ++ Json);
-                    {{not_found, missing}, RevId} ->
-                        RevStr = couch_doc:rev_to_str(RevId),
-                        Json = ?JSON_ENCODE({[{<<"missing">>, RevStr}]}),
-                        send_chunk(Resp, AccSeparator ++ Json)
-                    end,
-                    "," % AccSeparator now has a comma
-                end,
-                "", Results),
-            send_chunk(Resp, "]"),
-            end_json_response(Resp);
-        true ->
-            send_docs_multipart(Req, Results, Options)
-        end
+                case lists:member("multipart/mixed", AcceptedTypes) of
+                false ->
+                    {ok, Resp} = start_json_response(Req, 200),
+                    send_chunk(Resp, "["),
+                    % We loop through the docs. The first time through the separator
+                    % is whitespace, then a comma on subsequent iterations.
+                    lists:foldl(
+                        fun(Result, AccSeparator) ->
+                            case Result of
+                            {ok, Doc} ->
+                                JsonDoc = couch_doc:to_json_obj(Doc, Options),
+                                Json = ?JSON_ENCODE({[{ok, JsonDoc}]}),
+                                send_chunk(Resp, AccSeparator ++ Json);
+                            {{not_found, missing}, RevId} ->
+                                RevStr = couch_doc:rev_to_str(RevId),
+                                Json = ?JSON_ENCODE({[{<<"missing">>, RevStr}]}),
+                                send_chunk(Resp, AccSeparator ++ Json)
+                            end,
+                            "," % AccSeparator now has a comma
+                        end,
+                        "", Results),
+                    send_chunk(Resp, "]"),
+                    end_json_response(Resp);
+                true ->
+                    send_docs_multipart(Req, Results, Options)
+                end
         end
     end;
 


Mime
View raw message