Author: fdmanana
Date: Fri Nov 19 12:37:27 2010
New Revision: 1036818
URL: http://svn.apache.org/viewvc?rev=1036818&view=rev
Log:
For absolute consistency, renamed aliases start_key_docid and end_key_docid to
start_key_doc_id and end_key_doc_id.
Modified:
couchdb/trunk/CHANGES
couchdb/trunk/share/www/script/test/view_pagination.js
couchdb/trunk/src/couchdb/couch_httpd_view.erl
Modified: couchdb/trunk/CHANGES
URL:
http://svn.apache.org/viewvc/couchdb/trunk/CHANGES?rev=1036818&r1=1036817&r2=1036818&view=diff
==============================================================================
--- couchdb/trunk/CHANGES (original)
+++ couchdb/trunk/CHANGES Fri Nov 19 12:37:27 2010
@@ -40,8 +40,8 @@ View Server:
returning a `stale=ok` response.
* Warn about empty result caused by `startkey` and `endkey` limiting.
* Built-in reduce function `_sum` now accepts lists of integers as input.
- * Added view query aliases start_key, end_key, start_key_docid and
- end_key_docid.
+ * Added view query aliases start_key, end_key, start_key_doc_id and
+ end_key_doc_id.
Version 1.0.1
-------------
Modified: couchdb/trunk/share/www/script/test/view_pagination.js
URL:
http://svn.apache.org/viewvc/couchdb/trunk/share/www/script/test/view_pagination.js?rev=1036818&r1=1036817&r2=1036818&view=diff
==============================================================================
--- couchdb/trunk/share/www/script/test/view_pagination.js (original)
+++ couchdb/trunk/share/www/script/test/view_pagination.js Fri Nov 19 12:37:27
2010
@@ -37,10 +37,10 @@ couchTests.view_pagination = function(de
T(queryResults.rows[j].key == i + j);
}
- // test aliases start_key and start_key_docid
+ // test aliases start_key and start_key_doc_id
queryResults = db.query(queryFun, null, {
start_key: i,
- start_key_docid: i,
+ start_key_doc_id: i,
limit: 10
});
T(queryResults.rows.length == 10);
@@ -135,12 +135,12 @@ couchTests.view_pagination = function(de
});
testEndkeyDocId(queryResults);
- // test aliases end_key_docid and end_key
+ // test aliases end_key_doc_id and end_key
queryResults = db.query(function(doc) { emit(null, null); }, null, {
start_key: null,
- start_key_docid: 1,
+ start_key_doc_id: 1,
end_key: null,
- end_key_docid: 40
+ end_key_doc_id: 40
});
testEndkeyDocId(queryResults);
Modified: couchdb/trunk/src/couchdb/couch_httpd_view.erl
URL:
http://svn.apache.org/viewvc/couchdb/trunk/src/couchdb/couch_httpd_view.erl?rev=1036818&r1=1036817&r2=1036818&view=diff
==============================================================================
--- couchdb/trunk/src/couchdb/couch_httpd_view.erl (original)
+++ couchdb/trunk/src/couchdb/couch_httpd_view.erl Fri Nov 19 12:37:27 2010
@@ -272,12 +272,12 @@ parse_view_param("key", Value) ->
% TODO: maybe deprecate startkey_docid
parse_view_param("startkey_docid", Value) ->
[{start_docid, ?l2b(Value)}];
-parse_view_param("start_key_docid", Value) ->
+parse_view_param("start_key_doc_id", Value) ->
[{start_docid, ?l2b(Value)}];
% TODO: maybe deprecate endkey_docid
parse_view_param("endkey_docid", Value) ->
[{end_docid, ?l2b(Value)}];
-parse_view_param("end_key_docid", Value) ->
+parse_view_param("end_key_doc_id", Value) ->
[{end_docid, ?l2b(Value)}];
% TODO: maybe deprecate startkey
parse_view_param("startkey", Value) ->
