diff options
| author | Christopher Lenz <cmlenz@apache.org> | 2008-08-31 09:43:41 +0000 |
|---|---|---|
| committer | Christopher Lenz <cmlenz@apache.org> | 2008-08-31 09:43:41 +0000 |
| commit | 15a175144d83d6177e9bbb923a7f7157e5ea8917 (patch) | |
| tree | 92b7becc9610c46f87ddf7ab4c313642b007c4aa /src/couchdb/couch_db.hrl | |
| parent | ac4075a7987dc43aadeb18a94e07f090d1b77546 (diff) | |
Merged json_term_changes branch back into trunk.
git-svn-id: https://svn.apache.org/repos/asf/incubator/couchdb/trunk@690668 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'src/couchdb/couch_db.hrl')
| -rw-r--r-- | src/couchdb/couch_db.hrl | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/src/couchdb/couch_db.hrl b/src/couchdb/couch_db.hrl index 43860a1a..fa604108 100644 --- a/src/couchdb/couch_db.hrl +++ b/src/couchdb/couch_db.hrl @@ -14,7 +14,10 @@ -define(DESIGN_DOC_PREFIX0, "_design"). -define(DESIGN_DOC_PREFIX, "_design/"). --define(DEFAULT_ATTACHMENT_CONTENT_TYPE, "application/octet-stream"). +-define(JSON_ENCODE(V), mochijson2:encode(V)). +-define(JSON_DECODE(V), mochijson2:decode(V)). + +-define(DEFAULT_ATTACHMENT_CONTENT_TYPE, <<"application/octet-stream">>). -define(LOG_DEBUG(Format, Args), case couch_log:debug_on() of @@ -33,8 +36,8 @@ -record(doc_info, { - id = "", - rev = "", + id = <<"">>, + rev = <<"">>, update_seq = 0, summary_pointer = nil, conflict_revs = [], @@ -43,7 +46,7 @@ }). -record(full_doc_info, - {id = "", + {id = <<"">>, update_seq = 0, deleted = false, rev_tree = [] @@ -51,11 +54,11 @@ -record(doc, { - id = "", + id = <<"">>, revs = [], % the json body object. - body = {obj, []}, + body = {[]}, % each attachment contains: % {data, Type, <<binary>>} |