Improved etag handling for show funcs and db_doc requests; main.js cleanup (baby steps); null doc allowed for show funcs

git-svn-id: https://svn.apache.org/repos/asf/couchdb/trunk@738237 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 4 insertions, 11 deletions

diff --git a/src/couchdb/couch_httpd_db.erl b/src/couchdb/couch_httpd_db.erl
index 9ef7387c..73d90fe6 100644
--- a/src/couchdb/couch_httpd_db.erl
+++ b/src/couchdb/couch_httpd_db.erl
@@ -387,20 +387,13 @@ db_doc_req(#httpd{method='GET'}=Req, Db, DocId) ->
     [] ->
         Doc = couch_doc_open(Db, DocId, Rev, Options),
         DiskEtag = couch_httpd:doc_etag(Doc),
-        EtagsToMatch = string:tokens(
-                    couch_httpd:header_value(Req, "If-None-Match", ""), ", "),
-        case lists:member(DiskEtag, EtagsToMatch) of
-        true ->
-            % the client has this in their cache.
-            couch_httpd:send_response(Req, 304, [{"Etag", DiskEtag}], <<>>);
-        false ->
-            Headers =
-            case Doc#doc.meta of
+        couch_httpd:etag_respond(Req, DiskEtag, fun() -> 
+            Headers = case Doc#doc.meta of
             [] -> [{"Etag", DiskEtag}]; % output etag only when we have no meta
             _ -> []
             end,
-            send_json(Req, 200, Headers, couch_doc:to_json_obj(Doc, Options))
-        end;
+            send_json(Req, 200, Headers, couch_doc:to_json_obj(Doc, Options))            
+        end);
     _ ->
         {ok, Results} = couch_db:open_doc_revs(Db, DocId, Revs, Options),
         {ok, Resp} = start_json_response(Req, 200),