67 lines
2.2 KiB
Diff
67 lines
2.2 KiB
Diff
--- libs/mongo/build/linux2/normal/mongo/shell/mongo.cpp 2013-02-17 03:17:22.966734885 +0300
|
|
+++ dev/robomongo/src/robomongo/shell/mongo.cpp 2013-01-13 03:00:26.137467036 +0300
|
|
@@ -1,7 +1,7 @@
|
|
-#include "bson/stringdata.h"
|
|
+#include "mongo/bson/stringdata.h"
|
|
namespace mongo {
|
|
struct JSFile{ const char* name; const StringData& source; };
|
|
namespace JSFiles{
|
|
const StringData _jscode_raw_utils =
|
|
"__quiet = false;\n"
|
|
"__magicNoPrint = { __magicNoPrint : 1111 }\n"
|
|
@@ -1254,13 +1254,13 @@
|
|
"return x.shellPrint();\n"
|
|
"\n"
|
|
"var p = x.tojson;\n"
|
|
"if (typeof p == \"function\")\n"
|
|
"print(x.tojson());\n"
|
|
"else\n"
|
|
-"print(tojson(x));\n"
|
|
+"print(x); //P was print(tojson(x));\n"
|
|
"}\n"
|
|
"\n"
|
|
"shellAutocomplete = function ( /*prefix*/ ) { // outer scope function called on init. Actual function at end\n"
|
|
"\n"
|
|
"var universalMethods = \"constructor prototype toString valueOf toLocaleString hasOwnProperty propertyIsEnumerable\".split( ' ' );\n"
|
|
"\n"
|
|
@@ -3768,22 +3768,22 @@
|
|
"\n"
|
|
"DBQuery.prototype.shellPrint = function(){\n"
|
|
"try {\n"
|
|
"var start = new Date().getTime();\n"
|
|
"var n = 0;\n"
|
|
"while ( this.hasNext() && n < DBQuery.shellBatchSize ){\n"
|
|
-"var s = this._prettyShell ? tojson( this.next() ) : tojson( this.next() , \"\" , true );\n"
|
|
+"var s = this.next(); //P was: this._prettyShell ? tojson( this.next() ) : tojson( this.next() , \"\" , true );\n"
|
|
"print( s );\n"
|
|
"n++;\n"
|
|
"}\n"
|
|
"if (typeof _verboseShell !== 'undefined' && _verboseShell) {\n"
|
|
"var time = new Date().getTime() - start;\n"
|
|
"print(\"Fetched \" + n + \" record(s) in \" + time + \"ms\");\n"
|
|
"}\n"
|
|
"if ( this.hasNext() ){\n"
|
|
-"print( \"Type \\\"it\\\" for more\" );\n"
|
|
+"//P print( \"Type \\\"it\\\" for more\" );\n"
|
|
"___it___ = this;\n"
|
|
"}\n"
|
|
"else {\n"
|
|
"___it___ = null;\n"
|
|
"}\n"
|
|
"}\n"
|
|
@@ -3794,13 +3794,13 @@
|
|
"}\n"
|
|
"\n"
|
|
"DBQuery.prototype.toString = function(){\n"
|
|
"return \"DBQuery: \" + this._ns + \" -> \" + tojson( this.query );\n"
|
|
"}\n"
|
|
"\n"
|
|
-"DBQuery.shellBatchSize = 20;\n"
|
|
+"DBQuery.shellBatchSize = 50;\n"
|
|
"\n"
|
|
"/**\n"
|
|
"* Query option flag bit constants.\n"
|
|
"* @see http://dochub.mongodb.org/core/mongowireprotocol#MongoWireProtocol-OPQUERY\n"
|
|
"*/\n"
|
|
"DBQuery.Option = {\n"
|