diff options
Diffstat (limited to 'src/couchdb')
| -rw-r--r-- | src/couchdb/couch_httpd_view.erl | 13 | ||||
| -rw-r--r-- | src/couchdb/couch_view_updater.erl | 6 |
2 files changed, 11 insertions, 8 deletions
diff --git a/src/couchdb/couch_httpd_view.erl b/src/couchdb/couch_httpd_view.erl index 489df0a2..4c9902ed 100644 --- a/src/couchdb/couch_httpd_view.erl +++ b/src/couchdb/couch_httpd_view.erl @@ -376,7 +376,7 @@ validate_view_query(reduce, _, Args) -> validate_view_query(include_docs, true, Args) -> case Args#view_query_args.view_type of reduce -> - Msg = <<"Query paramter `include_docs` " + Msg = <<"Query parameter `include_docs` " "is invalid for reduce views.">>, throw({query_parse_error, Msg}); _ -> @@ -638,11 +638,14 @@ finish_reduce_fold(Req, Resp) -> end_json_response(Resp) end. -parse_bool_param("true") -> true; -parse_bool_param("false") -> false; parse_bool_param(Val) -> - Msg = io_lib:format("Invalid value for boolean paramter: ~p", [Val]), - throw({query_parse_error, ?l2b(Msg)}). + case string:to_lower(Val) of + "true" -> true; + "false" -> false; + _ -> + Msg = io_lib:format("Invalid boolean parameter: ~p", [Val]), + throw({query_parse_error, ?l2b(Msg)}) + end. parse_int_param(Val) -> case (catch list_to_integer(Val)) of diff --git a/src/couchdb/couch_view_updater.erl b/src/couchdb/couch_view_updater.erl index 6f04d93a..475f59ac 100644 --- a/src/couchdb/couch_view_updater.erl +++ b/src/couchdb/couch_view_updater.erl @@ -137,7 +137,7 @@ do_maps(Group, MapQueue, WriteQueue, ViewEmptyKVs) -> do_maps(Group1, MapQueue, WriteQueue, ViewEmptyKVs) end. -do_writes(Parent, Owner, Group, WriteQueue, IntitalBuild) -> +do_writes(Parent, Owner, Group, WriteQueue, InitialBuild) -> case couch_work_queue:dequeue(WriteQueue) of closed -> Parent ! {new_group, Group}; @@ -155,12 +155,12 @@ do_writes(Parent, Owner, Group, WriteQueue, IntitalBuild) -> AccViewKVs2, DocIdViewIdKeys ++ AccDocIdViewIdKeys} end, nil, Queue), Group2 = write_changes(Group, ViewKeyValues, DocIdViewIdKeys, NewSeq, - IntitalBuild), + InitialBuild), case Owner of nil -> ok; _ -> ok = gen_server:cast(Owner, {partial_update, Parent, Group2}) end, - do_writes(Parent, Owner, Group2, WriteQueue, IntitalBuild) + do_writes(Parent, Owner, Group2, WriteQueue, InitialBuild) end. view_insert_query_results([], [], ViewKVs, DocIdViewIdKeysAcc) -> |