summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Christopher Anderson <jchris@apache.org>2009-01-10 17:53:37 +0000
committerJohn Christopher Anderson <jchris@apache.org>2009-01-10 17:53:37 +0000
commit9d59968a12500f1063b9a8d6a7407f79c72b21b7 (patch)
tree728e820f6bfd06127c1a14bda0b0eae142df456a
parentb9831e19e8637688a77c03f2790503bdff59fff3 (diff)
include_docs error handling
git-svn-id: https://svn.apache.org/repos/asf/couchdb/trunk@733305 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r--src/couchdb/couch_httpd_view.erl8
1 files changed, 5 insertions, 3 deletions
diff --git a/src/couchdb/couch_httpd_view.erl b/src/couchdb/couch_httpd_view.erl
index 76b2f4af..2ce68b67 100644
--- a/src/couchdb/couch_httpd_view.erl
+++ b/src/couchdb/couch_httpd_view.erl
@@ -433,10 +433,12 @@ view_row_obj(Db, {{Key, DocId}, Value}, IncludeDocs) ->
end,
?LOG_DEBUG("Include Doc: ~p ~p", [DocId, Rev]),
case (catch couch_httpd_db:couch_doc_open(Db, DocId, Rev, [])) of
- {{not_found, missing}, _} ->
- {[{id, DocId}, {key, Key}, {value, Value}, {error, missing}]};
+ {{not_found, missing}, _RevId} ->
+ {[{id, DocId}, {key, Key}, {value, Value}, {error, missing}]};
+ {not_found, missing} ->
+ {[{id, DocId}, {key, Key}, {value, Value}, {error, missing}]};
{not_found, deleted} ->
- {[{id, DocId}, {key, Key}, {value, Value}]};
+ {[{id, DocId}, {key, Key}, {value, Value}]};
Doc ->
JsonDoc = couch_doc:to_json_obj(Doc, []),
{[{id, DocId}, {key, Key}, {value, Value}, {doc, JsonDoc}]}