change update=false to stale=ok

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

1 files changed, 6 insertions, 4 deletions

diff --git a/src/couchdb/couch_httpd_view.erl b/src/couchdb/couch_httpd_view.erl
index 2ce68b67..dca1e6e3 100644
--- a/src/couchdb/couch_httpd_view.erl
+++ b/src/couchdb/couch_httpd_view.erl
@@ -23,15 +23,15 @@
 
 design_doc_view(Req, Db, Id, ViewName, Keys) ->
     #view_query_args{
-        update = Update,
+        stale = Stale,
         reduce = Reduce
     } = QueryArgs = parse_view_query(Req, Keys),
     DesignId = <<"_design/", Id/binary>>,
-    case couch_view:get_map_view(Db, DesignId, ViewName, Update) of
+    case couch_view:get_map_view(Db, DesignId, ViewName, Stale) of
     {ok, View} ->    
         output_map_view(Req, View, Db, QueryArgs, Keys);
     {not_found, Reason} ->
-        case couch_view:get_reduce_view(Db, DesignId, ViewName, Update) of
+        case couch_view:get_reduce_view(Db, DesignId, ViewName, Stale) of
         {ok, ReduceView} ->
             parse_view_query(Req, Keys, true), % just for validation
             case Reduce of
@@ -256,8 +256,10 @@ parse_view_query(Req, Keys, IsReduce) ->
             end;
         {"count", Value} ->
             throw({query_parse_error, "URL query parameter 'count' has been changed to 'limit'."});
+        {"stale", "ok"} ->
+            Args#view_query_args{stale=ok};
         {"update", "false"} ->
-            Args#view_query_args{update=false};
+            throw({query_parse_error, "URL query parameter 'update=false' has been changed to 'stale=ok'."});
         {"descending", "true"} ->
             case Args#view_query_args.direction of
             fwd ->