summaryrefslogtreecommitdiff
path: root/src/couchdb/couch_view_updater.erl
diff options
context:
space:
mode:
authorJohn Christopher Anderson <jchris@apache.org>2009-05-23 01:14:13 +0000
committerJohn Christopher Anderson <jchris@apache.org>2009-05-23 01:14:13 +0000
commitc41c2168f0bf0c561448962dd7573b272ce3e447 (patch)
tree696e96764adf520e2b0373c734ed0e912ee2f655 /src/couchdb/couch_view_updater.erl
parent0292cbac7611bfa101bae29f31f9723001677752 (diff)
added an design doc option so that doc._local_seq can be available in the map view. Closes COUCHDB-346
git-svn-id: https://svn.apache.org/repos/asf/couchdb/trunk@777757 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'src/couchdb/couch_view_updater.erl')
-rw-r--r--src/couchdb/couch_view_updater.erl13
1 files changed, 11 insertions, 2 deletions
diff --git a/src/couchdb/couch_view_updater.erl b/src/couchdb/couch_view_updater.erl
index c06e733e..f5b17b37 100644
--- a/src/couchdb/couch_view_updater.erl
+++ b/src/couchdb/couch_view_updater.erl
@@ -97,11 +97,20 @@ process_doc(Db, DocInfo, {Docs, #group{sig=Sig,name=GroupId,design_options=Desig
#doc_info{id=DocId, revs=[#rev_info{deleted=Deleted}|_]} = DocInfo,
IncludeDesign = proplists:get_value(<<"include_design">>,
DesignOptions, false),
+ LocalSeq = proplists:get_value(<<"local_seq">>,
+ DesignOptions, false),
+ DocOpts = case LocalSeq of
+ true ->
+ [conflicts, deleted_conflicts, local_seq];
+ _ ->
+ [conflicts, deleted_conflicts]
+ end,
+ ?LOG_ERROR("DocOpts ~p LocalSeq ~p",[DocOpts, LocalSeq]),
case {IncludeDesign, DocId} of
{_, GroupId} ->
% uh oh. this is the design doc with our definitions. See if
% anything in the definition changed.
- case couch_db:open_doc_int(Db, DocInfo, [conflicts, deleted_conflicts]) of
+ case couch_db:open_doc_int(Db, DocInfo, DocOpts) of
{ok, Doc} ->
case couch_view_group:design_doc_to_view_group(Doc) of
#group{sig=Sig} ->
@@ -126,7 +135,7 @@ process_doc(Db, DocInfo, {Docs, #group{sig=Sig,name=GroupId,design_options=Desig
{Docs, [{DocId, []} | DocIdViewIdKeys]};
true ->
{ok, Doc} = couch_db:open_doc_int(Db, DocInfo,
- [conflicts, deleted_conflicts]),
+ DocOpts),
{[Doc | Docs], DocIdViewIdKeys}
end,