summaryrefslogtreecommitdiff
path: root/src/couchdb/couch_httpd_db.erl
diff options
context:
space:
mode:
authorJohn Christopher Anderson <jchris@apache.org>2009-01-22 23:55:43 +0000
committerJohn Christopher Anderson <jchris@apache.org>2009-01-22 23:55:43 +0000
commit3e12deff5c0f87eefcd3de8dbf93a9724e98258e (patch)
tree618608166d2a5c5235d3073e42140eaeda808057 /src/couchdb/couch_httpd_db.erl
parent3a54f4199f66812b7b9496b91a4aebd47dcb7218 (diff)
Fix some eJSON stragglers (works with mochijson2, but not eep18). thanks kocolosk!
git-svn-id: https://svn.apache.org/repos/asf/couchdb/trunk@736856 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'src/couchdb/couch_httpd_db.erl')
-rw-r--r--src/couchdb/couch_httpd_db.erl10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/couchdb/couch_httpd_db.erl b/src/couchdb/couch_httpd_db.erl
index fc13622d..c7c9ec15 100644
--- a/src/couchdb/couch_httpd_db.erl
+++ b/src/couchdb/couch_httpd_db.erl
@@ -129,7 +129,7 @@ db_req(#httpd{method='POST',path_parts=[_,<<"_bulk_docs">>]}=Req, Db) ->
% output the results
DocResults = lists:zipwith(
fun(Doc, NewRev) ->
- {[{"id", Doc#doc.id}, {"rev", NewRev}]}
+ {[{<<"id">>, Doc#doc.id}, {<<"rev">>, NewRev}]}
end,
Docs, ResultRevs),
send_json(Req, 201, {[
@@ -210,17 +210,17 @@ db_req(#httpd{method='GET',path_parts=[_,<<"_all_docs_by_seq">>]}=Req, Db) ->
deleted_conflict_revs=DelConflictRevs
} = DocInfo,
Json = {
- [{"rev", Rev}] ++
+ [{<<"rev">>, Rev}] ++
case ConflictRevs of
[] -> [];
- _ -> [{"conflicts", ConflictRevs}]
+ _ -> [{<<"conflicts">>, ConflictRevs}]
end ++
case DelConflictRevs of
[] -> [];
- _ -> [{"deleted_conflicts", DelConflictRevs}]
+ _ -> [{<<"deleted_conflicts">>, DelConflictRevs}]
end ++
case Deleted of
- true -> [{"deleted", true}];
+ true -> [{<<"deleted">>, true}];
false -> []
end
},