From 3e12deff5c0f87eefcd3de8dbf93a9724e98258e Mon Sep 17 00:00:00 2001
From: John Christopher Anderson <jchris@apache.org>
Date: Thu, 22 Jan 2009 23:55:43 +0000
Subject: 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
---
 src/couchdb/couch_httpd_db.erl            | 10 +++++-----
 src/couchdb/couch_httpd_misc_handlers.erl |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'src')

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
             },
diff --git a/src/couchdb/couch_httpd_misc_handlers.erl b/src/couchdb/couch_httpd_misc_handlers.erl
index 5a1f6ee4..31e821ce 100644
--- a/src/couchdb/couch_httpd_misc_handlers.erl
+++ b/src/couchdb/couch_httpd_misc_handlers.erl
@@ -107,7 +107,7 @@ handle_uuids_req(#httpd{method='POST'}=Req) ->
     % generate the uuids
     UUIDs = [ couch_util:new_uuid() || _ <- lists:seq(1,Count)],
     % send a JSON response
-    send_json(Req, {[{"uuids", UUIDs}]});
+    send_json(Req, {[{<<"uuids">>, UUIDs}]});
 handle_uuids_req(Req) ->
     send_method_not_allowed(Req, "POST").
 
-- 
cgit v1.2.3