diff options
Diffstat (limited to 'share')
| -rw-r--r-- | share/server/main.js | 4 | ||||
| -rw-r--r-- | share/www/script/couch_tests.js | 40 |
2 files changed, 22 insertions, 22 deletions
diff --git a/share/server/main.js b/share/server/main.js index e7184682..59acb02f 100644 --- a/share/server/main.js +++ b/share/server/main.js @@ -16,7 +16,7 @@ var map_results = []; // holds temporary emitted values during doc map var sandbox = null; -map = function(key, value) { +emit = function(key, value) { map_results.push([key, value]); } @@ -32,7 +32,7 @@ sum = function(values) { try { // if possible, use evalcx (not always available) sandbox = evalcx(''); - sandbox.map = map; + sandbox.emit = emit; sandbox.sum = sum; } catch (e) {} diff --git a/share/www/script/couch_tests.js b/share/www/script/couch_tests.js index 7b35cf87..cb8e8506 100644 --- a/share/www/script/couch_tests.js +++ b/share/www/script/couch_tests.js @@ -59,7 +59,7 @@ var tests = { // has a value of 4, and then returns the document's b value. var mapFunction = function(doc){ if(doc.a==4) - map(null, doc.b); + emit(null, doc.b); }; results = db.query(mapFunction); @@ -208,7 +208,7 @@ var tests = { } // query all documents, and return the doc.integer member as a key. - results = db.query(function(doc){ map(doc.integer, null) }); + results = db.query(function(doc){ emit(doc.integer, null) }); T(results.total_rows == numDocsToCreate); @@ -218,7 +218,7 @@ var tests = { } // do the query again, but with descending output - results = db.query(function(doc){ map(doc.integer, null) }, {descending:true}); + results = db.query(function(doc){ emit(doc.integer, null) }, {descending:true}); T(results.total_rows == numDocsToCreate); @@ -238,7 +238,7 @@ var tests = { T(db.bulkSave(docs).ok); var summate = function(N) {return (N+1)*N/2;}; - var map = function (doc) {map(doc.integer, doc.integer)}; + var map = function (doc) {emit(doc.integer, doc.integer)}; var reduce = function (keys, values) { return sum(values); }; var result = db.reduce_query(map, reduce).result; T(result == summate(numDocs)); @@ -277,7 +277,7 @@ var tests = { var generateListOfCitiesAndState = "function(doc) {" + " for (var i = 0; i < doc.cities.length; i++)" + - " map(doc.cities[i] + \", \" + doc._id, null);" + + " emit(doc.cities[i] + \", \" + doc._id, null);" + "}"; var results = db.query(generateListOfCitiesAndState); @@ -348,7 +348,7 @@ var tests = { // query all documents, and return the doc.foo member as a key. results = db.query(function(doc){ - map(null, doc.longtest); + emit(null, doc.longtest); }); }, @@ -376,7 +376,7 @@ var tests = { } // check that views and key collation don't blow up - var rows = db.query(function(doc) { map(null, doc.text) }).rows; + var rows = db.query(function(doc) { emit(null, doc.text) }).rows; for (var i=0; i<texts.length; i++) { T(rows[i].value == texts[i]); } @@ -438,10 +438,10 @@ var tests = { _id:"_design/test", language: "javascript", views: { - all_docs: "function(doc) { map(doc.integer, null) }", - no_docs: "function(doc) {}", - single_doc: "function(doc) { if (doc._id == \"1\") { map(1, null) }}", - summate: {map:"function (doc) {map(doc.integer, doc.integer)};", + all_docs: {map: "function(doc) { emit(doc.integer, null) }"}, + no_docs: {map: "function(doc) {}"}, + single_doc: {map: "function(doc) { if (doc._id == \"1\") { emit(1, null) }}"}, + summate: {map:"function (doc) {emit(doc.integer, doc.integer)};", reduce:"function (keys, values) { return sum(values); };"} } } @@ -548,7 +548,7 @@ var tests = { db.save({_id:(i).toString(), foo:values[i]}); } - var queryFun = function(doc) { map(doc.foo, null); } + var queryFun = function(doc) { emit(doc.foo, null); } var rows = db.query(queryFun).rows; for (i=0; i<values.length; i++) { T(equals(rows[i].key, values[i])) @@ -600,7 +600,7 @@ var tests = { var results = dbB.query(function(doc) { if (doc._conflicts) { - map(doc._id, doc._conflicts); + emit(doc._id, doc._conflicts); } }); T(results.rows[0].value[0] == conflictRev); @@ -615,7 +615,7 @@ var tests = { var docs = makeDocs(0, 100); T(db.bulkSave(docs).ok); - var queryFun = function(doc) { map(doc.integer, null) }; + var queryFun = function(doc) { emit(doc.integer, null) }; var i; // page through the view ascending and going forward @@ -695,7 +695,7 @@ var tests = { // make sure that attempting to change the document throws an error var results = db.query(function(doc) { doc._id = "foo"; - map(null, doc); + emit(null, doc); }); T(results.total_rows == 0); @@ -703,18 +703,18 @@ var tests = { // garbage collector var results = db.query(function(doc) { gc(); - map(null, doc); + emit(null, doc); }); T(results.total_rows == 0); // make sure that a view cannot access the map_funs array defined used by // the view server - var results = db.query(function(doc) { map_funs.push(1); map(null, doc) }); + var results = db.query(function(doc) { map_funs.push(1); emit(null, doc) }); T(results.total_rows == 0); // make sure that a view cannot access the map_results array defined used by // the view server - var results = db.query(function(doc) { map_results.push(1); map(null, doc) }); + var results = db.query(function(doc) { map_results.push(1); emit(null, doc) }); T(results.total_rows == 0); }, @@ -730,7 +730,7 @@ var tests = { var results = db.query( "function(doc) {\n" + " var xml = new XML(doc.content);\n" + - " map(xml.title.text(), null);\n" + + " emit(xml.title.text(), null);\n" + "}"); T(results.total_rows == 2); T(results.rows[0].key == "Testing E4X"); @@ -739,7 +739,7 @@ var tests = { var results = db.query( "function(doc) {\n" + " var xml = new XML(doc.content);\n" + - " map(xml.title.@id, null);\n" + + " emit(xml.title.@id, null);\n" + "}"); T(results.total_rows == 2); T(results.rows[0].key == "e4x"); |