rollback mixed up commit, builds now

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

1 files changed, 6 insertions, 11 deletions

diff --git a/src/couchdb/couch_httpd_db.erl b/src/couchdb/couch_httpd_db.erl
index 1adda839..d0960936 100644
--- a/src/couchdb/couch_httpd_db.erl
+++ b/src/couchdb/couch_httpd_db.erl
@@ -74,13 +74,11 @@ start_sending_changes(Resp, _Else) ->
 
 handle_changes_req(#httpd{method='GET',path_parts=[DbName|_]}=Req, Db) ->
     {FilterFun, EndFilterFun} = make_filter_funs(Req, Db),
-    {ok, Info} = couch_db:get_db_info(Db),
-    Seq = proplists:get_value(update_seq, Info),
     {Dir, StartSeq} = case couch_httpd:qs_value(Req, "descending", "false") of 
         "false" -> 
             {fwd, list_to_integer(couch_httpd:qs_value(Req, "since", "0"))}; 
         "true" -> 
-            {rev, Seq}; % super big value, should use current db seq
+            {rev, 1000000000000000}; % super big value, should use current db seq
         _Bad -> throw({bad_request, "descending must be true or false"})
     end,
     ResponseType = couch_httpd:qs_value(Req, "feed", "normal"),
@@ -106,6 +104,7 @@ handle_changes_req(#httpd{method='GET',path_parts=[DbName|_]}=Req, Db) ->
             get_rest_db_updated() % clean out any remaining update messages
         end;
     true ->
+        {ok, Info} = couch_db:get_db_info(Db),
         CurrentEtag = couch_httpd:make_etag(Info),
         couch_httpd:etag_respond(Req, CurrentEtag, fun() ->
             % send the etag
@@ -163,19 +162,19 @@ keep_sending_changes(#httpd{user_ctx=UserCtx,path_parts=[DbName|_]}=Req, Resp,
     end.
 
 changes_enumerator(DocInfos, {Db, _, _, FilterFun, Resp, "continuous", IncludeDocs}) ->
-    [#doc_info{id=Id, high_seq=Seq, revs=[#rev_info{rev=#rev_info{deleted=Del}=Rev}|_]}|_] = DocInfos,
+    [#doc_info{id=Id, high_seq=Seq, revs=[#rev_info{rev=Rev}|_]}|_] = DocInfos,
     Results0 = [FilterFun(DocInfo) || DocInfo <- DocInfos],
     Results = [Result || Result <- Results0, Result /= null],
     case Results of
     [] ->
         {ok, {Db, Seq, nil, FilterFun, Resp, "continuous", IncludeDocs}};
     _ ->
-        send_chunk(Resp, [?JSON_ENCODE(changes_row(Db, Seq, Id, Del, Results, Rev, IncludeDocs))
+        send_chunk(Resp, [?JSON_ENCODE(changes_row(Db, Seq, Id, Results, Rev, IncludeDocs))
             |"\n"]),
         {ok, {Db, Seq, nil, FilterFun, Resp, "continuous", IncludeDocs}}
     end;
 changes_enumerator(DocInfos, {Db, _, Prepend, FilterFun, Resp, _, IncludeDocs}) ->
-    [#doc_info{id=Id, high_seq=Seq, revs=[#rev_info{rev=#rev_info{deleted=Del}=Rev}|_]}|_] = DocInfos,
+    [#doc_info{id=Id, high_seq=Seq, revs=[#rev_info{rev=Rev}|_]}|_] = DocInfos,
     Results0 = [FilterFun(DocInfo) || DocInfo <- DocInfos],
     Results = [Result || Result <- Results0, Result /= null],
     case Results of
@@ -183,22 +182,18 @@ changes_enumerator(DocInfos, {Db, _, Prepend, FilterFun, Resp, _, IncludeDocs})
         {ok, {Db, Seq, Prepend, FilterFun, Resp, nil, IncludeDocs}};
     _ ->
         send_chunk(Resp, [Prepend, ?JSON_ENCODE(
-            changes_row(Db, Seq, Id, Del, Results, Rev, IncludeDocs))]),
+            changes_row(Db, Seq, Id, Results, Rev, IncludeDocs))]),
         {ok, {Db, Seq, <<",\n">>, FilterFun, Resp, nil, IncludeDocs}}
     end.
 
 changes_row(Db, Seq, Id, Results, Rev, true) ->
     {[{seq,Seq},{id,Id},
         {changes,Results}] ++
-        deleted_item(Del) ++
         couch_httpd_view:doc_member(Db, Id, Rev)};
 changes_row(_, Seq, Id, Results, _, false) ->
     {[{seq,Seq},{id,Id},
         {changes,Results}]}.
 
-deleted_item(true) -> [{deleted,true}];
-deleted_item(_) -> [].
-
 send_changes(Req, Resp, Db, Dir, StartSeq, Prepend, ResponseType, FilterFun, End) ->
     Style = list_to_existing_atom(
             couch_httpd:qs_value(Req, "style", "main_only")),