diff options
| author | John Christopher Anderson <jchris@apache.org> | 2009-01-09 19:03:22 +0000 |
|---|---|---|
| committer | John Christopher Anderson <jchris@apache.org> | 2009-01-09 19:03:22 +0000 |
| commit | fbabdb19583198cf77add0b9cff354d70c45ff5a (patch) | |
| tree | ba576fc81dab8e98a550d25af621b045d3a989ef /src/couchdb/couch_httpd_view.erl | |
| parent | e19b5124101f2ff5aa755df99b0fcbd0923aa01f (diff) | |
fixed _all_docs view to use the correct PassedEndFun for binary docid sorting
git-svn-id: https://svn.apache.org/repos/asf/couchdb/trunk@733116 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'src/couchdb/couch_httpd_view.erl')
| -rw-r--r-- | src/couchdb/couch_httpd_view.erl | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/src/couchdb/couch_httpd_view.erl b/src/couchdb/couch_httpd_view.erl index de184de9..76b2f4af 100644 --- a/src/couchdb/couch_httpd_view.erl +++ b/src/couchdb/couch_httpd_view.erl @@ -15,7 +15,7 @@ -export([handle_view_req/2,handle_slow_view_req/2]). --export([parse_view_query/1,parse_view_query/2,make_view_fold_fun/5,finish_view_fold/3]). +-export([parse_view_query/1,parse_view_query/2,make_view_fold_fun/5, make_view_fold_fun/6,finish_view_fold/3]). -import(couch_httpd, [send_json/2,send_json/3,send_json/4,send_method_not_allowed/2, @@ -361,14 +361,13 @@ parse_view_query(Req, Keys, IsReduce) -> end. -make_view_fold_fun(Req, QueryArgs, Db, TotalViewCount, ReduceCountFun) -> +make_view_fold_fun(Req, QueryArgs, Db, + TotalViewCount, ReduceCountFun) -> #view_query_args{ end_key = EndKey, end_docid = EndDocId, - include_docs = IncludeDocs, direction = Dir } = QueryArgs, - PassedEndFun = case Dir of fwd -> @@ -380,6 +379,12 @@ make_view_fold_fun(Req, QueryArgs, Db, TotalViewCount, ReduceCountFun) -> couch_view:less_json([ViewKey, ViewId], [EndKey, EndDocId]) end end, + make_view_fold_fun(Req, QueryArgs, Db, TotalViewCount, ReduceCountFun, PassedEndFun). + +make_view_fold_fun(Req, QueryArgs, Db, TotalViewCount, ReduceCountFun, PassedEndFun) -> + #view_query_args{ + include_docs = IncludeDocs + } = QueryArgs, fun({{Key, DocId}, Value}, OffsetReds, {AccLimit, AccSkip, Resp, AccRevRows}) -> |