diff options
| author | Adam Kocoloski <adam@cloudant.com> | 2011-10-04 13:11:12 -0700 |
|---|---|---|
| committer | Adam Kocoloski <adam@cloudant.com> | 2011-10-04 13:11:12 -0700 |
| commit | da7284ed2844926c7df0efef12ba30d8e2e6d039 (patch) | |
| tree | 10fa2d5cf35bfae4d48fc632924cec98ee02a22a /apps/couch/src/couch_httpd_db.erl | |
| parent | b57aadd742e4f8cc925ba4f005ae658c43a7c5b4 (diff) | |
| parent | 4e19639a64d3033e1cc7c22a0b7404d277643c78 (diff) | |
Merge pull request #67 from cloudant/12645-merge_latest_1.1.x
Diffstat (limited to 'apps/couch/src/couch_httpd_db.erl')
| -rw-r--r-- | apps/couch/src/couch_httpd_db.erl | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/apps/couch/src/couch_httpd_db.erl b/apps/couch/src/couch_httpd_db.erl index 71204598..0bf97e26 100644 --- a/apps/couch/src/couch_httpd_db.erl +++ b/apps/couch/src/couch_httpd_db.erl @@ -128,7 +128,7 @@ handle_changes_req1(Req, Db) -> handle_compact_req(#httpd{method='POST',path_parts=[DbName,_,Id|_]}=Req, Db) -> ok = couch_db:check_is_admin(Db), couch_httpd:validate_ctype(Req, "application/json"), - ok = couch_view_compactor:start_compact(DbName, Id), + {ok, _} = couch_view_compactor:start_compact(DbName, Id), send_json(Req, 202, {[{ok, true}]}); handle_compact_req(#httpd{method='POST'}=Req, Db) -> @@ -477,6 +477,7 @@ db_req(#httpd{path_parts=[_, DocId | FileNameParts]}=Req, Db) -> db_attachment_req(Req, Db, DocId, FileNameParts). all_docs_view(Req, Db, Keys) -> + RawCollator = fun(A, B) -> A < B end, #view_query_args{ start_key = StartKey, start_docid = StartDocId, @@ -486,7 +487,8 @@ all_docs_view(Req, Db, Keys) -> skip = SkipCount, direction = Dir, inclusive_end = Inclusive - } = QueryArgs = couch_httpd_view:parse_view_params(Req, Keys, map), + } = QueryArgs + = couch_httpd_view:parse_view_params(Req, Keys, map, RawCollator), {ok, Info} = couch_db:get_db_info(Db), CurrentEtag = couch_httpd:make_etag(Info), couch_httpd:etag_respond(Req, CurrentEtag, fun() -> |