diff options
author | Dwight <dmerriman@gmail.com> | 2008-03-31 08:35:28 -0400 |
---|---|---|
committer | Dwight <dmerriman@gmail.com> | 2008-03-31 08:35:28 -0400 |
commit | b9666b4db13c2abeb1414b5f730f3baf166b42eb (patch) | |
tree | b0c11ade7b3cb28d71cd0e5cbaac553e23c0ad7e | |
parent | 93b8ffe1830891f093dd466d55625043e1ad2abb (diff) | |
download | mongo-b9666b4db13c2abeb1414b5f730f3baf166b42eb.tar.gz |
switch machines
-rw-r--r-- | db/jsobj.cpp | 5 | ||||
-rw-r--r-- | db/query.cpp | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/db/jsobj.cpp b/db/jsobj.cpp index b8ad2b7b266..cdae3ffeed7 100644 --- a/db/jsobj.cpp +++ b/db/jsobj.cpp @@ -65,7 +65,10 @@ public: strcpy(codeCopy,code);
func = JavaJS->functionCreate( code );
minilex.grabVariables(codeCopy, fields);
- fullObject = fields.count("fullObject") > 0;
+ // if user references db, eg db.foo.save(obj),
+ // we make sure we have the whole thing.
+ fullObject = fields.count("fullObject") +
+ fields.count("db") > 0;
nFields = fields.size();
}
diff --git a/db/query.cpp b/db/query.cpp index b52f2a6ab59..07f06f0d565 100644 --- a/db/query.cpp +++ b/db/query.cpp @@ -404,6 +404,8 @@ bool dbEval(JSObj& cmd, JSObjBuilder& result) { Element args = cmd.findElement("args");
if( args.type() == Array ) {
JSObj eo = args.embeddedObject();
+ cout << "args:" << eo.toString() << endl;
+ cout << "code:\n" << code << endl;
s.setObject("args", eo);
}
|