fix shell printing

mongodb · Jun 12, 2009 · a4a895e · a4a895e
1 parent 8b61455
commit a4a895e
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/scripting/engine_spidermonkey.cpp b/scripting/engine_spidermonkey.cpp
@@ -980,6 +980,9 @@ namespace mongo {
                 // already printed in reportError, so... TODO
             }
 
+            if ( worked )
+                _convertor->setProperty( _global , "__lastres__" , ret );
+
             if ( worked && printResult && ! JSVAL_IS_VOID( ret ) )
                 cout << _convertor->toString( ret ) << endl;
 

diff --git a/shell/dbshell.cpp b/shell/dbshell.cpp
@@ -321,8 +321,10 @@ int main(int argc, char* argv[]) {
 
             }
 
-            if ( ! wascmd )
-                scope->exec( code.c_str() , "(shell)" , true , true , false );
+            if ( ! wascmd ){
+                scope->exec( code.c_str() , "(shell)" , false , true , false );
+                scope->exec( "shellPrintHelper( __lastres__ );" , "(shell2)" , true , true , false );
+            }
 
 
             shellHistoryAdd( line );