diff options
| author | Jan Lehnardt <jan@apache.org> | 2009-08-01 11:16:36 +0000 |
|---|---|---|
| committer | Jan Lehnardt <jan@apache.org> | 2009-08-01 11:16:36 +0000 |
| commit | 2cf4fec22fa7214b11363eb7430c411e0afa6221 (patch) | |
| tree | bca51ad663ea1392ce9b2b4dea6e05ccb6733c1f /src | |
| parent | a05287f49dc20ef83f89668f1d2603174823565e (diff) | |
enable include_docs=true for list functions, patch by Mark Hammond, closes COUCHDB-444
git-svn-id: https://svn.apache.org/repos/asf/couchdb/trunk@799835 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'src')
| -rw-r--r-- | src/couchdb/couch_httpd_show.erl | 10 | ||||
| -rw-r--r-- | src/couchdb/couch_query_servers.erl | 8 |
2 files changed, 9 insertions, 9 deletions
diff --git a/src/couchdb/couch_httpd_show.erl b/src/couchdb/couch_httpd_show.erl index a73105b4..40f0dc11 100644 --- a/src/couchdb/couch_httpd_show.erl +++ b/src/couchdb/couch_httpd_show.erl @@ -207,18 +207,18 @@ start_list_resp(QueryServer, Req, Db, Head, Etag) -> {ok, Resp, ?b2l(?l2b(Chunks))}. make_map_send_row_fun(QueryServer) -> - fun(Resp, Db, Row, _IncludeDocs, RowFront) -> - send_list_row(Resp, QueryServer, Db, Row, RowFront) + fun(Resp, Db, Row, IncludeDocs, RowFront) -> + send_list_row(Resp, QueryServer, Db, Row, RowFront, IncludeDocs) end. make_reduce_send_row_fun(QueryServer, Db) -> fun(Resp, Row, RowFront) -> - send_list_row(Resp, QueryServer, Db, Row, RowFront) + send_list_row(Resp, QueryServer, Db, Row, RowFront, false) end. -send_list_row(Resp, QueryServer, Db, Row, RowFront) -> +send_list_row(Resp, QueryServer, Db, Row, RowFront, IncludeDoc) -> try - [Go,Chunks] = couch_query_servers:render_list_row(QueryServer, Db, Row), + [Go,Chunks] = couch_query_servers:render_list_row(QueryServer, Db, Row, IncludeDoc), Chunk = RowFront ++ ?b2l(?l2b(Chunks)), send_non_empty_chunk(Resp, Chunk), case Go of diff --git a/src/couchdb/couch_query_servers.erl b/src/couchdb/couch_query_servers.erl index 1d452796..bb0cc853 100644 --- a/src/couchdb/couch_query_servers.erl +++ b/src/couchdb/couch_query_servers.erl @@ -19,7 +19,7 @@ -export([start_doc_map/2, map_docs/2, stop_doc_map/1]). -export([reduce/3, rereduce/3,validate_doc_update/5]). -export([render_doc_show/6, start_view_list/2, - render_list_head/4, render_list_row/3, render_list_tail/1]). + render_list_head/4, render_list_row/4, render_list_tail/1]). -export([start_filter/2, filter_doc/4, end_filter/1]). % -export([test/0]). @@ -199,11 +199,11 @@ render_list_head({_Lang, Pid}, Req, Db, Head) -> JsonReq = couch_httpd_external:json_req_obj(Req, Db), couch_os_process:prompt(Pid, [<<"list">>, Head, JsonReq]). -render_list_row({_Lang, Pid}, Db, {{Key, DocId}, Value}) -> - JsonRow = couch_httpd_view:view_row_obj(Db, {{Key, DocId}, Value}, false), +render_list_row({_Lang, Pid}, Db, {{Key, DocId}, Value}, IncludeDoc) -> + JsonRow = couch_httpd_view:view_row_obj(Db, {{Key, DocId}, Value}, IncludeDoc), couch_os_process:prompt(Pid, [<<"list_row">>, JsonRow]); -render_list_row({_Lang, Pid}, _, {Key, Value}) -> +render_list_row({_Lang, Pid}, _, {Key, Value}, _IncludeDoc) -> JsonRow = {[{key, Key}, {value, Value}]}, couch_os_process:prompt(Pid, [<<"list_row">>, JsonRow]). |