diff options
| author | Adam Kocoloski <adam@cloudant.com> | 2010-07-06 11:40:38 -0400 |
|---|---|---|
| committer | Adam Kocoloski <adam@cloudant.com> | 2010-08-12 11:18:48 -0400 |
| commit | 02767bad6e66b88ebf3e74fbd70ca49a4fbfae5a (patch) | |
| tree | b154d7d074ea20fa471bba2173b12ecd2603f3ad | |
| parent | a0b4c5dea139fa5829c99de0529b2f7e14bf05a9 (diff) | |
rearrange fabric arguments to match couch_btree
| -rw-r--r-- | src/chttpd_db.erl | 8 | ||||
| -rw-r--r-- | src/chttpd_show.erl | 2 | ||||
| -rw-r--r-- | src/chttpd_view.erl | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/src/chttpd_db.erl b/src/chttpd_db.erl index 579ac623..39f1cfc7 100644 --- a/src/chttpd_db.erl +++ b/src/chttpd_db.erl @@ -58,13 +58,13 @@ handle_changes_req(#httpd{method='GET'}=Req, Db) -> couch_stats_collector:record({couchdb, dbinfo}, DeltaT), chttpd:etag_respond(Req, Etag, fun() -> {ok, Resp} = chttpd:start_json_response(Req, 200, [{"Etag",Etag}]), - fabric:changes(Db, ChangesArgs, fun changes_callback/2, - {"normal", Resp}) + fabric:changes(Db, fun changes_callback/2, {"normal", Resp}, + ChangesArgs) end); Feed -> % "longpoll" or "continuous" {ok, Resp} = chttpd:start_json_response(Req, 200), - fabric:changes(Db, ChangesArgs, fun changes_callback/2, {Feed, Resp}) + fabric:changes(Db, fun changes_callback/2, {Feed, Resp}, ChangesArgs) end; handle_changes_req(#httpd{path_parts=[_,<<"_changes">>]}=Req, _Db) -> send_method_not_allowed(Req, "GET,HEAD"). @@ -387,7 +387,7 @@ all_docs_view(Req, Db, Keys) -> QueryArgs = chttpd_view:parse_view_params(Req, Keys, map), chttpd:etag_respond(Req, Etag, fun() -> {ok, Resp} = chttpd:start_json_response(Req, 200, [{"Etag",Etag}]), - fabric:all_docs(Db, QueryArgs, fun all_docs_callback/2, {nil, Resp}) + fabric:all_docs(Db, fun all_docs_callback/2, {nil, Resp}, QueryArgs) end). all_docs_callback({total_and_offset, Total, Offset}, {_, Resp}) -> diff --git a/src/chttpd_show.erl b/src/chttpd_show.erl index 9d67774a..fba7f040 100644 --- a/src/chttpd_show.erl +++ b/src/chttpd_show.erl @@ -199,7 +199,7 @@ handle_view_list(Req, Db, DDoc, LName, {ViewDesignName, ViewName}, Keys) -> db = Db, etag = Etag }, - fabric:query_view(Db, VDoc, ViewName, QueryArgs, CB, Acc0) + fabric:query_view(Db, VDoc, ViewName, CB, Acc0, QueryArgs) end) end). diff --git a/src/chttpd_view.erl b/src/chttpd_view.erl index f3376af7..6d29101a 100644 --- a/src/chttpd_view.erl +++ b/src/chttpd_view.erl @@ -37,7 +37,7 @@ design_doc_view(Req, Db, DDoc, ViewName, Keys) -> chttpd:etag_respond(Req, Etag, fun() -> {ok, Resp} = chttpd:start_json_response(Req, 200, [{"Etag",Etag}]), CB = fun view_callback/2, - fabric:query_view(Db, DDoc, ViewName, QueryArgs, CB, {nil, Resp}) + fabric:query_view(Db, DDoc, ViewName, CB, {nil, Resp}, QueryArgs) end). view_callback({total_and_offset, Total, Offset}, {nil, Resp}) -> |