diff options
| author | Filipe David Borba Manana <fdmanana@apache.org> | 2010-09-30 12:03:15 +0000 |
|---|---|---|
| committer | Filipe David Borba Manana <fdmanana@apache.org> | 2010-09-30 12:03:15 +0000 |
| commit | 6ae13b5f8b827bc87a8cf3306c3caa1b97e49df3 (patch) | |
| tree | 9662164348a314705094f5f52456ab7bfe330df9 /src/couchdb/couch_rep_reader.erl | |
| parent | 1c0a6e9c637fcfec2990c6318b3c69e4c7591d76 (diff) | |
Removing ?getv macros.
With OTP releases up to R13B03 it's not possible to define a 2 macro functions with the same name and different arities.
(Only allowed in R13B04 and R14).
git-svn-id: https://svn.apache.org/repos/asf/couchdb/trunk@1003025 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'src/couchdb/couch_rep_reader.erl')
| -rw-r--r-- | src/couchdb/couch_rep_reader.erl | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/couchdb/couch_rep_reader.erl b/src/couchdb/couch_rep_reader.erl index 1e496acf..4f81c8e4 100644 --- a/src/couchdb/couch_rep_reader.erl +++ b/src/couchdb/couch_rep_reader.erl @@ -253,7 +253,7 @@ open_doc_revs(#http_db{url = Url} = DbS, DocId, Revs) -> }, [Doc1 | Acc]; ({ErrorProps}, Acc) -> - Err = ?getv(<<"error">>, ErrorProps, + Err = couch_util:get_value(<<"error">>, ErrorProps, ?JSON_ENCODE({ErrorProps})), ?LOG_ERROR("Replicator: error accessing doc ~s at ~s, reason: ~s", [DocId, couch_util:url_strip_password(Url), Err]), @@ -268,14 +268,14 @@ open_doc(#http_db{url = Url} = DbS, DocId) -> qs=[{att_encoding_info, true}] }, {Props} = Json = couch_rep_httpc:request(Req), - case ?getv(<<"_id">>, Props) of + case couch_util:get_value(<<"_id">>, Props) of Id when is_binary(Id) -> #doc{id=Id, revs=Rev, atts=Atts} = Doc = couch_doc:from_json_obj(Json), [Doc#doc{ atts=[couch_rep_att:convert_stub(A, {DbS,Id,Rev}) || A <- Atts] }]; undefined -> - Err = ?getv(<<"error">>, Props, ?JSON_ENCODE(Json)), + Err = couch_util:get_value(<<"error">>, Props, ?JSON_ENCODE(Json)), ?LOG_ERROR("Replicator: error accessing doc ~s at ~s, reason: ~s", [DocId, couch_util:url_strip_password(Url), Err]), [] |