summaryrefslogtreecommitdiff
path: root/src/couchdb/couch_httpd_view.erl
diff options
context:
space:
mode:
authorJan Lehnardt <jan@apache.org>2009-08-12 18:48:25 +0000
committerJan Lehnardt <jan@apache.org>2009-08-12 18:48:25 +0000
commitd6cb0bc17d834675a69620940036490b909a4b0d (patch)
treeacfcc1dc0c9acb7e27085f10fbecace4e2b5eace /src/couchdb/couch_httpd_view.erl
parenta975795f527de1f535a4536e602aa9040d975e80 (diff)
add native /db/_conflicts view, patch by Adam Kocolosk, closes COUCHDB-462
git-svn-id: https://svn.apache.org/repos/asf/couchdb/trunk@803663 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'src/couchdb/couch_httpd_view.erl')
-rw-r--r--src/couchdb/couch_httpd_view.erl6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/couchdb/couch_httpd_view.erl b/src/couchdb/couch_httpd_view.erl
index 8264186b..da9d478d 100644
--- a/src/couchdb/couch_httpd_view.erl
+++ b/src/couchdb/couch_httpd_view.erl
@@ -314,6 +314,8 @@ parse_view_param("include_docs", Value) ->
[{include_docs, parse_bool_param(Value)}];
parse_view_param("list", Value) ->
[{list, ?l2b(Value)}];
+parse_view_param("deleted", Value) ->
+ [{deleted, parse_bool_param(Value)}];
parse_view_param("callback", _) ->
[]; % Verified in the JSON response functions
parse_view_param(Key, Value) ->
@@ -398,7 +400,9 @@ validate_view_query(include_docs, true, Args) ->
validate_view_query(include_docs, _Value, Args) ->
Args;
validate_view_query(extra, _Value, Args) ->
- Args.
+ Args;
+validate_view_query(deleted, Value, Args) ->
+ Args#view_query_args{deleted = Value}.
make_view_fold_fun(Req, QueryArgs, Etag, Db, TotalViewCount, HelperFuns) ->
#view_query_args{