Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Document Id and Rev in response headers #32

Closed
wants to merge 3 commits into from
Closed

Document Id and Rev in response headers #32

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
fe934a1
Document Id and Rev in response headers
bjnortier Sep 20, 2012
b383740
Only return X-Couch-Id (rev is available in ETag)
bjnortier Sep 21, 2012
a1f224e
Test the X-Couch-Id header
bjnortier Nov 2, 2012
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 3 additions & 1 deletion share/www/script/test/update_documents.js
View file
Open in desktop
Expand Up @@ -107,6 +107,7 @@ couchTests.update_documents = function(debug) {
var resp = db.save(doc);
T(resp.ok);
var docid = resp.id;
T(equals(docid, db.last_req.getResponseHeader("X-Couch-Id")));

// update error
var xhr = CouchDB.request("POST", "/test_suite_db/_design/update/_update/");
Expand All @@ -117,7 +118,8 @@ couchTests.update_documents = function(debug) {
xhr = CouchDB.request("PUT", "/test_suite_db/_design/update/_update/hello/"+docid);
T(xhr.status == 201);
T(xhr.responseText == "<p>hello doc</p>");
T(/charset=utf-8/.test(xhr.getResponseHeader("Content-Type")))
T(/charset=utf-8/.test(xhr.getResponseHeader("Content-Type")));
T(equals(docid, xhr.getResponseHeader("X-Couch-Id")));

doc = db.open(docid);
T(doc.world == "hello");
Expand Down
14 changes: 13 additions & 1 deletion src/couch_mrview/src/couch_mrview_show.erl
View file
Open in desktop
Expand Up @@ -144,9 +144,21 @@ send_doc_update_response(Req, Db, DDoc, UpdateName, Doc, DocId) ->
couch_doc:validate_docid(NewDoc#doc.id),
{ok, NewRev} = couch_db:update_doc(Db, NewDoc, Options),
NewRevStr = couch_doc:rev_to_str(NewRev),
DocIdHeader = case DocId of
null ->
[{<<"json">>, {Props}}] = JsonResp0,
case lists:keyfind(<<"id">>, 1, Props) of
{_, NewDocId} ->
[{<<"X-Couch-Id">>, NewDocId}];
false ->
[]
end;
DocId ->
[{<<"X-Couch-Id">>, DocId}]
end,
{[
{<<"code">>, 201},
{<<"headers">>, {[{<<"X-Couch-Update-NewRev">>, NewRevStr}]}}
{<<"headers">>, {[{<<"X-Couch-Update-NewRev">>, NewRevStr}] ++ DocIdHeader}}
| JsonResp0]};
[<<"up">>, _Other, {JsonResp0}] ->
{[{<<"code">>, 200} | JsonResp0]}
Expand Down
13 changes: 12 additions & 1 deletion src/couchdb/couch_httpd.erl
View file
Open in desktop
Expand Up @@ -690,8 +690,19 @@ send_json(Req, Code, Headers, Value) ->
{"Content-Type", negotiate_content_type(Req)},
{"Cache-Control", "must-revalidate"}
],
IdHeader = case Value of
{Props} when is_list(Props) ->
case lists:keyfind(id, 1, Props) of
{_, Id} ->
[{"X-Couch-Id", Id}];
_ ->
[]
end;
_ ->
[]
end,
Body = [start_jsonp(), ?JSON_ENCODE(Value), end_jsonp(), $\n],
send_response(Req, Code, DefaultHeaders ++ Headers, Body).
send_response(Req, Code, DefaultHeaders ++ IdHeader ++ Headers, Body).

start_json_response(Req, Code) ->
start_json_response(Req, Code, []).
Expand Down