Merge commit 'upstream/1.8.0

1 files changed, 336 insertions, 292 deletions

diff --git a/scripting/sm_db.cpp b/scripting/sm_db.cpp
index 8ba612b..4c9d541 100644
--- a/scripting/sm_db.cpp
+++ b/scripting/sm_db.cpp
@@ -34,15 +34,15 @@ namespace mongo {
     bool haveLocalShardingInfo( const string& ns );
 
     // ------------    some defs needed ---------------
-    
+
     JSObject * doCreateCollection( JSContext * cx , JSObject * db , const string& shortName );
-        
+
     // ------------     utils          ------------------
-         
 
-    bool isSpecialName( const string& name ){
+
+    bool isSpecialName( const string& name ) {
         static set<string> names;
-        if ( names.size() == 0 ){
+        if ( names.size() == 0 ) {
             names.insert( "tojson" );
             names.insert( "toJson" );
             names.insert( "toString" );
@@ -50,10 +50,10 @@ namespace mongo {
 
         if ( name.length() == 0 )
             return false;
-        
+
         if ( name[0] == '_' )
             return true;
-        
+
         return names.count( name ) > 0;
     }
 
@@ -63,8 +63,8 @@ namespace mongo {
     class CursorHolder {
     public:
         CursorHolder( auto_ptr< DBClientCursor > &cursor, const shared_ptr< DBClientWithCommands > &connection ) :
-        connection_( connection ),
-        cursor_( cursor ) {
+            connection_( connection ),
+            cursor_( cursor ) {
             assert( cursor_.get() );
         }
         DBClientCursor *get() const { return cursor_.get(); }
@@ -72,60 +72,60 @@ namespace mongo {
         shared_ptr< DBClientWithCommands > connection_;
         auto_ptr< DBClientCursor > cursor_;
     };
-    
+
     DBClientCursor *getCursor( JSContext *cx, JSObject *obj ) {
         CursorHolder * holder = (CursorHolder*)JS_GetPrivate( cx , obj );
         uassert( 10235 ,  "no cursor!" , holder );
         return holder->get();
     }
-    
-    JSBool internal_cursor_constructor( JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval ){
+
+    JSBool internal_cursor_constructor( JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval ) {
         uassert( 10236 ,  "no args to internal_cursor_constructor" , argc == 0 );
         assert( JS_SetPrivate( cx , obj , 0 ) ); // just for safety
         return JS_TRUE;
     }
 
-    void internal_cursor_finalize( JSContext * cx , JSObject * obj ){
+    void internal_cursor_finalize( JSContext * cx , JSObject * obj ) {
         CursorHolder * holder = (CursorHolder*)JS_GetPrivate( cx , obj );
-        if ( holder ){
+        if ( holder ) {
             delete holder;
             assert( JS_SetPrivate( cx , obj , 0 ) );
         }
     }
 
-    JSBool internal_cursor_hasNext(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval){
+    JSBool internal_cursor_hasNext(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) {
         DBClientCursor *cursor = getCursor( cx, obj );
         try {
             *rval = cursor->more() ? JSVAL_TRUE : JSVAL_FALSE;
         }
-        catch ( std::exception& e ){
+        catch ( std::exception& e ) {
             JS_ReportError( cx , e.what() );
             return JS_FALSE;
         }
         return JS_TRUE;
     }
 
-    JSBool internal_cursor_objsLeftInBatch(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval){
+    JSBool internal_cursor_objsLeftInBatch(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) {
         DBClientCursor *cursor = getCursor( cx, obj );
         Convertor c(cx);
         *rval = c.toval((double) cursor->objsLeftInBatch() );
         return JS_TRUE;
     }
 
-    JSBool internal_cursor_next(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval){
+    JSBool internal_cursor_next(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) {
         DBClientCursor *cursor = getCursor( cx, obj );
 
-        BSONObj n;        
-        
+        BSONObj n;
+
         try {
-            if ( ! cursor->more() ){
+            if ( ! cursor->more() ) {
                 JS_ReportError( cx , "cursor at the end" );
                 return JS_FALSE;
             }
 
             n = cursor->next();
         }
-        catch ( std::exception& e ){
+        catch ( std::exception& e ) {
             JS_ReportError( cx , e.what() );
             return JS_FALSE;
         }
@@ -149,15 +149,15 @@ namespace mongo {
         JSCLASS_NO_OPTIONAL_MEMBERS
     };
 
-    
+
     // ------ mongo stuff ------
 
-    JSBool mongo_constructor( JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval ){
+    JSBool mongo_constructor( JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval ) {
         uassert( 10237 ,  "mongo_constructor not implemented yet" , 0 );
         throw -1;
     }
-    
-    JSBool mongo_local_constructor( JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval ){
+
+    JSBool mongo_local_constructor( JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval ) {
         Convertor c( cx );
 
         shared_ptr< DBClientWithCommands > client( createDirectClient() );
@@ -169,29 +169,29 @@ namespace mongo {
         return JS_TRUE;
     }
 
-    JSBool mongo_external_constructor( JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval ){
+    JSBool mongo_external_constructor( JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval ) {
         Convertor c( cx );
-        
+
         smuassert( cx ,  "0 or 1 args to Mongo" , argc <= 1 );
-        
+
         string host = "127.0.0.1";
         if ( argc > 0 )
             host = c.toString( argv[0] );
-        
+
         string errmsg;
 
         ConnectionString cs = ConnectionString::parse( host , errmsg );
-        if ( ! cs.isValid() ){
+        if ( ! cs.isValid() ) {
             JS_ReportError( cx , errmsg.c_str() );
             return JS_FALSE;
         }
 
         shared_ptr< DBClientWithCommands > conn( cs.connect( errmsg ) );
-        if ( ! conn ){
+        if ( ! conn ) {
             JS_ReportError( cx , errmsg.c_str() );
             return JS_FALSE;
         }
-        
+
         ScriptEngine::runConnectCallback( *conn );
 
         assert( JS_SetPrivate( cx , obj , (void*)( new shared_ptr< DBClientWithCommands >( conn ) ) ) );
@@ -206,10 +206,10 @@ namespace mongo {
         uassert( 10239 ,  "no connection!" , connHolder && connHolder->get() );
         return connHolder->get();
     }
-    
-    void mongo_finalize( JSContext * cx , JSObject * obj ){
+
+    void mongo_finalize( JSContext * cx , JSObject * obj ) {
         shared_ptr< DBClientWithCommands > * connHolder = (shared_ptr< DBClientWithCommands >*)JS_GetPrivate( cx , obj );
-        if ( connHolder ){
+        if ( connHolder ) {
             delete connHolder;
             assert( JS_SetPrivate( cx , obj , 0 ) );
         }
@@ -220,30 +220,31 @@ namespace mongo {
         JS_PropertyStub, JS_PropertyStub, JS_PropertyStub, JS_PropertyStub,
         JS_EnumerateStub, JS_ResolveStub , JS_ConvertStub, mongo_finalize,
         JSCLASS_NO_OPTIONAL_MEMBERS
-     };
+    };
 
-    JSBool mongo_find(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval){
-        smuassert( cx , "mongo_find needs 6 args" , argc == 6 );
+    JSBool mongo_find(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) {
+        smuassert( cx , "mongo_find needs 7 args" , argc == 7 );
         shared_ptr< DBClientWithCommands > * connHolder = (shared_ptr< DBClientWithCommands >*)JS_GetPrivate( cx , obj );
         smuassert( cx ,  "no connection!" , connHolder && connHolder->get() );
         DBClientWithCommands *conn = connHolder->get();
-                      
+
         Convertor c( cx );
 
         string ns = c.toString( argv[0] );
-        
+
         BSONObj q = c.toObject( argv[1] );
         BSONObj f = c.toObject( argv[2] );
-        
+
         int nToReturn = (int) c.toNumber( argv[3] );
         int nToSkip = (int) c.toNumber( argv[4] );
         bool slaveOk = c.getBoolean( obj , "slaveOk" );
         int batchSize = (int) c.toNumber( argv[5] );
+        int options = (int)c.toNumber( argv[6] );
 
         try {
 
-            auto_ptr<DBClientCursor> cursor = conn->query( ns , q , nToReturn , nToSkip , f.nFields() ? &f : 0  , slaveOk ? QueryOption_SlaveOk : 0 , batchSize );
-            if ( ! cursor.get() ){
+            auto_ptr<DBClientCursor> cursor = conn->query( ns , q , nToReturn , nToSkip , f.nFields() ? &f : 0  , options | ( slaveOk ? QueryOption_SlaveOk : 0 ) , batchSize );
+            if ( ! cursor.get() ) {
                 log() << "query failed : " << ns << " " << q << " to: " << conn->toString() << endl;
                 JS_ReportError( cx , "error doing query: failed" );
                 return JS_FALSE;
@@ -254,19 +255,19 @@ namespace mongo {
             *rval = OBJECT_TO_JSVAL( mycursor );
             return JS_TRUE;
         }
-        catch ( ... ){
+        catch ( ... ) {
             JS_ReportError( cx , "error doing query: unknown" );
             return JS_FALSE;
         }
     }
 
-    JSBool mongo_update(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval){
+    JSBool mongo_update(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) {
         smuassert( cx ,  "mongo_find needs at elast 3 args" , argc >= 3 );
         smuassert( cx ,  "2nd param to update has to be an object" , JSVAL_IS_OBJECT( argv[1] ) );
         smuassert( cx ,  "3rd param to update has to be an object" , JSVAL_IS_OBJECT( argv[2] ) );
 
         Convertor c( cx );
-        if ( c.getBoolean( obj , "readOnly" ) ){
+        if ( c.getBoolean( obj , "readOnly" ) ) {
             JS_ReportError( cx , "js db in read only mode - mongo_update" );
             return JS_FALSE;
         }
@@ -283,76 +284,80 @@ namespace mongo {
             conn->update( ns , c.toObject( argv[1] ) , c.toObject( argv[2] ) , upsert , multi );
             return JS_TRUE;
         }
-        catch ( ... ){
+        catch ( ... ) {
             JS_ReportError( cx , "error doing update" );
             return JS_FALSE;
         }
     }
 
-    JSBool mongo_insert(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval){    
+    JSBool mongo_insert(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) {
         smuassert( cx ,  "mongo_insert needs 2 args" , argc == 2 );
         smuassert( cx ,  "2nd param to insert has to be an object" , JSVAL_IS_OBJECT( argv[1] ) );
 
         Convertor c( cx );
-        if ( c.getBoolean( obj , "readOnly" ) ){
+        if ( c.getBoolean( obj , "readOnly" ) ) {
             JS_ReportError( cx , "js db in read only mode - mongo_insert" );
             return JS_FALSE;
         }
-        
+
         DBClientWithCommands * conn = getConnection( cx, obj );
         uassert( 10248 ,  "no connection!" , conn );
-        
-        
+
         string ns = c.toString( argv[0] );
-        BSONObj o = c.toObject( argv[1] );
 
-        // TODO: add _id
-        
         try {
+            BSONObj o = c.toObject( argv[1] );
+            // TODO: add _id
+
             conn->insert( ns , o );
             return JS_TRUE;
         }
-        catch ( std::exception& e ){
+        catch ( std::exception& e ) {
             stringstream ss;
             ss << "error doing insert:" << e.what();
             string s = ss.str();
             JS_ReportError( cx , s.c_str() );
             return JS_FALSE;
         }
-        catch ( ... ){
+        catch ( ... ) {
             JS_ReportError( cx , "error doing insert" );
             return JS_FALSE;
         }
     }
 
-    JSBool mongo_remove(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval){    
+    JSBool mongo_remove(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) {
         smuassert( cx ,  "mongo_remove needs 2 or 3 arguments" , argc == 2 || argc == 3 );
         smuassert( cx ,  "2nd param to insert has to be an object" , JSVAL_IS_OBJECT( argv[1] ) );
 
         Convertor c( cx );
-        if ( c.getBoolean( obj , "readOnly" ) ){
+        if ( c.getBoolean( obj , "readOnly" ) ) {
             JS_ReportError( cx , "js db in read only mode - mongo_remove" );
             return JS_FALSE;
         }
 
         DBClientWithCommands * conn = getConnection( cx, obj );
         uassert( 10251 ,  "no connection!" , conn );
-        
+
         string ns = c.toString( argv[0] );
         BSONObj o = c.toObject( argv[1] );
         bool justOne = false;
         if ( argc > 2 )
             justOne = c.toBoolean( argv[2] );
-        
+
         try {
             conn->remove( ns , o , justOne );
             return JS_TRUE;
         }
-        catch ( ... ){
-            JS_ReportError( cx , "error doing remove" );
+        catch ( std::exception& e ) {
+            JS_ReportError( cx , e.what() );
             return JS_FALSE;
         }
         
+        catch ( ... ) {
+            JS_ReportError( cx , "error doing remove" );
+            return JS_FALSE;
+        }
+
     }
 
     JSFunctionSpec mongo_functions[] = {
@@ -363,93 +368,93 @@ namespace mongo {
         { 0 }
     };
 
-     // -------------  db_collection -------------
-
-     JSBool db_collection_constructor( JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval ){    
-         smuassert( cx ,  "db_collection_constructor wrong args" , argc == 4 );
-         assert( JS_SetProperty( cx , obj , "_mongo" , &(argv[0]) ) );
-         assert( JS_SetProperty( cx , obj , "_db" , &(argv[1]) ) );
-         assert( JS_SetProperty( cx , obj , "_shortName" , &(argv[2]) ) );
-         assert( JS_SetProperty( cx , obj , "_fullName" , &(argv[3]) ) );
-         
-         Convertor c(cx);
-         if ( haveLocalShardingInfo( c.toString( argv[3] ) ) ){
-             JS_ReportError( cx , "can't use sharded collection from db.eval" );
-             return JS_FALSE;
-         }
-         
-         return JS_TRUE;
-     }
-
-     JSBool db_collection_resolve( JSContext *cx, JSObject *obj, jsval id, uintN flags, JSObject **objp ){
-         if ( flags & JSRESOLVE_ASSIGNING )
-             return JS_TRUE;
-         
-         Convertor c( cx );
-         string collname = c.toString( id );
-
-         if ( isSpecialName( collname ) )
-             return JS_TRUE;
-         
-         if ( obj == c.getGlobalPrototype( "DBCollection" ) )
-             return JS_TRUE;
-         
-         JSObject * proto = JS_GetPrototype( cx , obj );
-         if ( c.hasProperty( obj , collname.c_str() ) || ( proto && c.hasProperty( proto , collname.c_str() )  ) )
-             return JS_TRUE;
-         
-         string name = c.toString( c.getProperty( obj , "_shortName" ) );
-         name += ".";
-         name += collname;
-         
-         jsval db = c.getProperty( obj , "_db" );
-         if ( ! JSVAL_IS_OBJECT( db ) )
-             return JS_TRUE;
-
-         JSObject * coll = doCreateCollection( cx , JSVAL_TO_OBJECT( db ) , name );
-         if ( ! coll )
-             return JS_FALSE;
-         c.setProperty( obj , collname.c_str() , OBJECT_TO_JSVAL( coll ) );
-         *objp = obj;
-         return JS_TRUE;
-     }
+    // -------------  db_collection -------------
+
+    JSBool db_collection_constructor( JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval ) {
+        smuassert( cx ,  "db_collection_constructor wrong args" , argc == 4 );
+        assert( JS_SetProperty( cx , obj , "_mongo" , &(argv[0]) ) );
+        assert( JS_SetProperty( cx , obj , "_db" , &(argv[1]) ) );
+        assert( JS_SetProperty( cx , obj , "_shortName" , &(argv[2]) ) );
+        assert( JS_SetProperty( cx , obj , "_fullName" , &(argv[3]) ) );
+
+        Convertor c(cx);
+        if ( haveLocalShardingInfo( c.toString( argv[3] ) ) ) {
+            JS_ReportError( cx , "can't use sharded collection from db.eval" );
+            return JS_FALSE;
+        }
+
+        return JS_TRUE;
+    }
+
+    JSBool db_collection_resolve( JSContext *cx, JSObject *obj, jsval id, uintN flags, JSObject **objp ) {
+        if ( flags & JSRESOLVE_ASSIGNING )
+            return JS_TRUE;
+
+        Convertor c( cx );
+        string collname = c.toString( id );
+
+        if ( isSpecialName( collname ) )
+            return JS_TRUE;
+
+        if ( obj == c.getGlobalPrototype( "DBCollection" ) )
+            return JS_TRUE;
+
+        JSObject * proto = JS_GetPrototype( cx , obj );
+        if ( c.hasProperty( obj , collname.c_str() ) || ( proto && c.hasProperty( proto , collname.c_str() )  ) )
+            return JS_TRUE;
+
+        string name = c.toString( c.getProperty( obj , "_shortName" ) );
+        name += ".";
+        name += collname;
+
+        jsval db = c.getProperty( obj , "_db" );
+        if ( ! JSVAL_IS_OBJECT( db ) )
+            return JS_TRUE;
+
+        JSObject * coll = doCreateCollection( cx , JSVAL_TO_OBJECT( db ) , name );
+        if ( ! coll )
+            return JS_FALSE;
+        c.setProperty( obj , collname.c_str() , OBJECT_TO_JSVAL( coll ) );
+        *objp = obj;
+        return JS_TRUE;
+    }
 
     JSClass db_collection_class = {
-         "DBCollection" , JSCLASS_HAS_PRIVATE | JSCLASS_NEW_RESOLVE , 
-         JS_PropertyStub, JS_PropertyStub, JS_PropertyStub, JS_PropertyStub,
-         JS_EnumerateStub, (JSResolveOp)(&db_collection_resolve) , JS_ConvertStub, JS_FinalizeStub,
-         JSCLASS_NO_OPTIONAL_MEMBERS
-     };
-
-
-     JSObject * doCreateCollection( JSContext * cx , JSObject * db , const string& shortName ){
-         Convertor c(cx);
-         
-         assert( c.hasProperty( db , "_mongo" ) );
-         assert( c.hasProperty( db , "_name" ) );
-         
-         JSObject * coll = JS_NewObject( cx , &db_collection_class , 0 , 0 );
-         CHECKNEWOBJECT( coll, cx, "doCreateCollection" );
-         c.setProperty( coll , "_mongo" , c.getProperty( db , "_mongo" ) );
-         c.setProperty( coll , "_db" , OBJECT_TO_JSVAL( db ) );
-         c.setProperty( coll , "_shortName" , c.toval( shortName.c_str() ) );
-         
-         string name = c.toString( c.getProperty( db , "_name" ) );
-         name += "." + shortName;
-         c.setProperty( coll , "_fullName" , c.toval( name.c_str() ) );
-         
-         if ( haveLocalShardingInfo( name ) ){
-             JS_ReportError( cx , "can't use sharded collection from db.eval" );
-             return 0;
-         }
-
-         return coll;
+        "DBCollection" , JSCLASS_HAS_PRIVATE | JSCLASS_NEW_RESOLVE ,
+        JS_PropertyStub, JS_PropertyStub, JS_PropertyStub, JS_PropertyStub,
+        JS_EnumerateStub, (JSResolveOp)(&db_collection_resolve) , JS_ConvertStub, JS_FinalizeStub,
+        JSCLASS_NO_OPTIONAL_MEMBERS
+    };
+
+
+    JSObject * doCreateCollection( JSContext * cx , JSObject * db , const string& shortName ) {
+        Convertor c(cx);
+
+        assert( c.hasProperty( db , "_mongo" ) );
+        assert( c.hasProperty( db , "_name" ) );
+
+        JSObject * coll = JS_NewObject( cx , &db_collection_class , 0 , 0 );
+        CHECKNEWOBJECT( coll, cx, "doCreateCollection" );
+        c.setProperty( coll , "_mongo" , c.getProperty( db , "_mongo" ) );
+        c.setProperty( coll , "_db" , OBJECT_TO_JSVAL( db ) );
+        c.setProperty( coll , "_shortName" , c.toval( shortName.c_str() ) );
+
+        string name = c.toString( c.getProperty( db , "_name" ) );
+        name += "." + shortName;
+        c.setProperty( coll , "_fullName" , c.toval( name.c_str() ) );
+
+        if ( haveLocalShardingInfo( name ) ) {
+            JS_ReportError( cx , "can't use sharded collection from db.eval" );
+            return 0;
+        }
+
+        return coll;
     }
-    
+
     // --------------  DB ---------------
-    
-    
-    JSBool db_constructor( JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval ){
+
+
+    JSBool db_constructor( JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval ) {
         smuassert( cx,  "wrong number of arguments to DB" , argc == 2 );
         assert( JS_SetProperty( cx , obj , "_mongo" , &(argv[0]) ) );
         assert( JS_SetProperty( cx , obj , "_name" , &(argv[1]) ) );
@@ -457,7 +462,7 @@ namespace mongo {
         return JS_TRUE;
     }
 
-    JSBool db_resolve( JSContext *cx, JSObject *obj, jsval id, uintN flags, JSObject **objp ){
+    JSBool db_resolve( JSContext *cx, JSObject *obj, jsval id, uintN flags, JSObject **objp ) {
         if ( flags & JSRESOLVE_ASSIGNING )
             return JS_TRUE;
 
@@ -467,9 +472,9 @@ namespace mongo {
             return JS_TRUE;
 
         string collname = c.toString( id );
-        
+
         if ( isSpecialName( collname ) )
-             return JS_TRUE;
+            return JS_TRUE;
 
         JSObject * proto = JS_GetPrototype( cx , obj );
         if ( proto && c.hasProperty( proto , collname.c_str() ) )
@@ -479,26 +484,26 @@ namespace mongo {
         if ( ! coll )
             return JS_FALSE;
         c.setProperty( obj , collname.c_str() , OBJECT_TO_JSVAL( coll ) );
-        
+
         *objp = obj;
         return JS_TRUE;
     }
 
     JSClass db_class = {
-        "DB" , JSCLASS_HAS_PRIVATE | JSCLASS_NEW_RESOLVE , 
+        "DB" , JSCLASS_HAS_PRIVATE | JSCLASS_NEW_RESOLVE ,
         JS_PropertyStub, JS_PropertyStub, JS_PropertyStub, JS_PropertyStub,
         JS_EnumerateStub, (JSResolveOp)(&db_resolve) , JS_ConvertStub, JS_FinalizeStub,
         JSCLASS_NO_OPTIONAL_MEMBERS
     };
-    
+
 
     // -------------- object id -------------
 
-    JSBool object_id_constructor( JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval ){
+    JSBool object_id_constructor( JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval ) {
         Convertor c( cx );
 
         OID oid;
-        if ( argc == 0 ){
+        if ( argc == 0 ) {
             oid.init();
         }
         else {
@@ -507,26 +512,27 @@ namespace mongo {
 
             try {
                 Scope::validateObjectIdString( s );
-            } catch ( const MsgAssertionException &m ) {
+            }
+            catch ( const MsgAssertionException &m ) {
                 static string error = m.toString();
                 JS_ReportError( cx, error.c_str() );
                 return JS_FALSE;
             }
             oid.init( s );
         }
-        
-        if ( ! JS_InstanceOf( cx , obj , &object_id_class , 0 ) ){
+
+        if ( ! JS_InstanceOf( cx , obj , &object_id_class , 0 ) ) {
             obj = JS_NewObject( cx , &object_id_class , 0 , 0 );
             CHECKNEWOBJECT( obj, cx, "object_id_constructor" );
             *rval = OBJECT_TO_JSVAL( obj );
         }
-        
+
         jsval v = c.toval( oid.str().c_str() );
         assert( JS_SetProperty( cx , obj , "str" , &v  ) );
 
         return JS_TRUE;
     }
-    
+
     JSClass object_id_class = {
         "ObjectId" , JSCLASS_HAS_PRIVATE ,
         JS_PropertyStub, JS_PropertyStub, JS_PropertyStub, JS_PropertyStub,
@@ -534,7 +540,7 @@ namespace mongo {
         JSCLASS_NO_OPTIONAL_MEMBERS
     };
 
-    JSBool object_id_tostring(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval){    
+    JSBool object_id_tostring(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) {
         Convertor c(cx);
         return (JSBool) (*rval = c.getProperty( obj , "str" ));
     }
@@ -546,26 +552,26 @@ namespace mongo {
 
     // dbpointer
 
-    JSBool dbpointer_constructor( JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval ){
+    JSBool dbpointer_constructor( JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval ) {
         Convertor c( cx );
-                
-        if ( argc == 2 ){
 
-            if ( ! JSVAL_IS_OID( argv[1] ) ){
+        if ( argc == 2 ) {
+
+            if ( ! JSVAL_IS_OID( argv[1] ) ) {
                 JS_ReportError( cx , "2nd arg to DBPointer needs to be oid" );
-                return JS_FALSE;            
+                return JS_FALSE;
             }
-            
+
             assert( JS_SetProperty( cx , obj , "ns" , &(argv[0]) ) );
             assert( JS_SetProperty( cx , obj , "id" , &(argv[1]) ) );
             return JS_TRUE;
         }
         else {
             JS_ReportError( cx , "DBPointer needs 2 arguments" );
-            return JS_FALSE;            
+            return JS_FALSE;
         }
     }
- 
+
     JSClass dbpointer_class = {
         "DBPointer" , JSCLASS_HAS_PRIVATE ,
         JS_PropertyStub, JS_PropertyStub, JS_PropertyStub, JS_PropertyStub,
@@ -578,10 +584,10 @@ namespace mongo {
     };
 
 
-    JSBool dbref_constructor( JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval ){
+    JSBool dbref_constructor( JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval ) {
         Convertor c( cx );
 
-        if ( argc == 2 ){
+        if ( argc == 2 ) {
             JSObject * o = JS_NewObject( cx , NULL , NULL, NULL );
             CHECKNEWOBJECT( o, cx, "dbref_constructor" );
             assert( JS_SetProperty( cx, o , "$ref" , &argv[ 0 ] ) );
@@ -593,37 +599,37 @@ namespace mongo {
         else {
             JS_ReportError( cx , "DBRef needs 2 arguments" );
             assert( JS_SetPrivate( cx , obj , (void*)(new BSONHolder( BSONObj().getOwned() ) ) ) );
-            return JS_FALSE;            
+            return JS_FALSE;
         }
     }
- 
+
     JSClass dbref_class = bson_class; // name will be fixed later
 
     // UUID **************************
 
-    JSBool uuid_constructor( JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval ){
+    JSBool uuid_constructor( JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval ) {
         Convertor c( cx );
-        
-        if( argc == 0 ) { 
+
+        if( argc == 0 ) {
 #if defined(HAVE_UUID)
             //uuids::uuid
 #else
 #endif
             JS_ReportError( cx , "UUID needs 1 argument -- UUID(hexstr)" );
-            return JS_FALSE;            
+            return JS_FALSE;
         }
         else if ( argc == 1 ) {
 
             string encoded = c.toString( argv[ 0 ] );
-	    if( encoded.size() != 32 ) { 
-	      JS_ReportError( cx, "expect 32 char hex string to UUID()" );
-	      return JS_FALSE;
-	    }
+            if( encoded.size() != 32 ) {
+                JS_ReportError( cx, "expect 32 char hex string to UUID()" );
+                return JS_FALSE;
+            }
 
-	    char buf[16];
-	    for( int i = 0; i < 16; i++ ) {
-	      buf[i] = fromHex(encoded.c_str() + i * 2);
-	    }
+            char buf[16];
+            for( int i = 0; i < 16; i++ ) {
+                buf[i] = fromHex(encoded.c_str() + i * 2);
+            }
 
             assert( JS_SetPrivate( cx, obj, new BinDataHolder( buf, 16 ) ) );
             c.setProperty( obj, "len", c.toval( (double)16 ) );
@@ -633,11 +639,11 @@ namespace mongo {
         }
         else {
             JS_ReportError( cx , "UUID needs 1 argument -- UUID(hexstr)" );
-            return JS_FALSE;            
+            return JS_FALSE;
         }
     }
- 
-  JSBool uuid_tostring(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval){    
+
+    JSBool uuid_tostring(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) {
         Convertor c(cx);
         void *holder = JS_GetPrivate( cx, obj );
         assert( holder );
@@ -649,15 +655,15 @@ namespace mongo {
         return *rval = c.toval( ret.c_str() );
     }
 
-    void uuid_finalize( JSContext * cx , JSObject * obj ){
+    void uuid_finalize( JSContext * cx , JSObject * obj ) {
         Convertor c(cx);
         void *holder = JS_GetPrivate( cx, obj );
-        if ( holder ){
+        if ( holder ) {
             delete ( BinDataHolder* )holder;
             assert( JS_SetPrivate( cx , obj , 0 ) );
         }
-    }    
-    
+    }
+
     JSClass uuid_class = {
         "UUID" , JSCLASS_HAS_PRIVATE ,
         JS_PropertyStub, JS_PropertyStub, JS_PropertyStub, JS_PropertyStub,
@@ -669,25 +675,25 @@ namespace mongo {
         { "toString" , uuid_tostring , 0 , JSPROP_READONLY | JSPROP_PERMANENT, 0 } ,
         { 0 }
     };
-    
+
     // BinData **************************
 
-    JSBool bindata_constructor( JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval ){
+    JSBool bindata_constructor( JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval ) {
         Convertor c( cx );
-        
-        if ( argc == 2 ){
+
+        if ( argc == 2 ) {
 
             int type = (int)c.toNumber( argv[ 0 ] );
-            if( type < 0 || type > 255 ) { 
+            if( type < 0 || type > 255 ) {
                 JS_ReportError( cx , "invalid BinData subtype -- range is 0..255 see bsonspec.org" );
-                return JS_FALSE;            
+                return JS_FALSE;
             }
             string encoded = c.toString( argv[ 1 ] );
             string decoded;
             try {
                 decoded = base64::decode( encoded );
             }
-            catch(...) { 
+            catch(...) {
                 JS_ReportError(cx, "BinData could not decode base64 parameter");
                 return JS_FALSE;
             }
@@ -700,11 +706,11 @@ namespace mongo {
         }
         else {
             JS_ReportError( cx , "BinData needs 2 arguments -- BinData(subtype,data)" );
-            return JS_FALSE;            
+            return JS_FALSE;
         }
     }
- 
-    JSBool bindata_tostring(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval){    
+
+    JSBool bindata_tostring(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) {
         Convertor c(cx);
         int type = (int)c.getNumber( obj , "type" );
         int len = (int)c.getNumber( obj, "len" );
@@ -719,7 +725,7 @@ namespace mongo {
         return *rval = c.toval( ret.c_str() );
     }
 
-    JSBool bindataBase64(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval){    
+    JSBool bindataBase64(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) {
         Convertor c(cx);
         int len = (int)c.getNumber( obj, "len" );
         void *holder = JS_GetPrivate( cx, obj );
@@ -731,7 +737,7 @@ namespace mongo {
         return *rval = c.toval( ret.c_str() );
     }
 
-    JSBool bindataAsHex(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval){    
+    JSBool bindataAsHex(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) {
         Convertor c(cx);
         int len = (int)c.getNumber( obj, "len" );
         void *holder = JS_GetPrivate( cx, obj );
@@ -747,27 +753,27 @@ namespace mongo {
         return *rval = c.toval( ret.c_str() );
     }
 
-    JSBool bindataLength(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval){    
+    JSBool bindataLength(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) {
         Convertor c(cx);
         int len = (int)c.getNumber( obj, "len" );
         return *rval = c.toval((double) len);
     }
 
-    JSBool bindataSubtype(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval){    
+    JSBool bindataSubtype(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) {
         Convertor c(cx);
         int t = (int)c.getNumber( obj, "type" );
         return *rval = c.toval((double) t);
     }
 
-    void bindata_finalize( JSContext * cx , JSObject * obj ){
+    void bindata_finalize( JSContext * cx , JSObject * obj ) {
         Convertor c(cx);
         void *holder = JS_GetPrivate( cx, obj );
-        if ( holder ){
+        if ( holder ) {
             delete ( BinDataHolder* )holder;
             assert( JS_SetPrivate( cx , obj , 0 ) );
         }
-    }    
-    
+    }
+
     JSClass bindata_class = {
         "BinData" , JSCLASS_HAS_PRIVATE ,
         JS_PropertyStub, JS_PropertyStub, JS_PropertyStub, JS_PropertyStub,
@@ -783,15 +789,15 @@ namespace mongo {
         { "subtype", bindataSubtype, 0, JSPROP_READONLY | JSPROP_PERMANENT, 0 } ,
         { 0 }
     };
-    
+
     // Map
 
-    bool specialMapString( const string& s ){
+    bool specialMapString( const string& s ) {
         return s == "put" || s == "get" || s == "_get" || s == "values" || s == "_data" || s == "constructor" ;
     }
 
-    JSBool map_constructor( JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval ){
-        if ( argc > 0 ){
+    JSBool map_constructor( JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval ) {
+        if ( argc > 0 ) {
             JS_ReportError( cx , "Map takes no arguments" );
             return JS_FALSE;
         }
@@ -804,28 +810,28 @@ namespace mongo {
 
         return JS_TRUE;
     }
- 
-    JSBool map_prop( JSContext *cx, JSObject *obj, jsval idval, jsval *vp ){
+
+    JSBool map_prop( JSContext *cx, JSObject *obj, jsval idval, jsval *vp ) {
         Convertor c(cx);
         if ( specialMapString( c.toString( idval ) ) )
             return JS_TRUE;
-        
+
         log() << "illegal prop access: " << c.toString( idval ) << endl;
         JS_ReportError( cx , "can't use array access with Map" );
         return JS_FALSE;
     }
-    
+
     JSClass map_class = {
         "Map" , JSCLASS_HAS_PRIVATE ,
         map_prop, JS_PropertyStub, map_prop, map_prop,
         JS_EnumerateStub, JS_ResolveStub , JS_ConvertStub, JS_FinalizeStub,
         JSCLASS_NO_OPTIONAL_MEMBERS
     };
-    
+
     JSFunctionSpec map_functions[] = {
         { 0 }
     };
-    
+
 
     // -----
 
@@ -835,23 +841,54 @@ namespace mongo {
         JS_EnumerateStub, JS_ResolveStub , JS_ConvertStub, JS_FinalizeStub,
         JSCLASS_NO_OPTIONAL_MEMBERS
     };
-    
+
+    JSBool timestamp_constructor( JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval ) {
+        smuassert( cx , "Timestamp needs 0 or 2 args" , argc == 0 || argc == 2 );
+
+        if ( ! JS_InstanceOf( cx , obj , &timestamp_class , 0 ) ) {
+            obj = JS_NewObject( cx , &timestamp_class , 0 , 0 );
+            CHECKNEWOBJECT( obj, cx, "timestamp_constructor" );
+            *rval = OBJECT_TO_JSVAL( obj );
+        }
+
+        Convertor c( cx );
+        if ( argc == 0 ) {
+            c.setProperty( obj, "t", c.toval( 0.0 ) );
+            c.setProperty( obj, "i", c.toval( 0.0 ) );
+        }
+        else {
+            c.setProperty( obj, "t", argv[ 0 ] );
+            c.setProperty( obj, "i", argv[ 1 ] );
+        }
+
+        return JS_TRUE;
+    }
+
+
     JSClass numberlong_class = {
         "NumberLong" , JSCLASS_HAS_PRIVATE ,
         JS_PropertyStub, JS_PropertyStub, JS_PropertyStub, JS_PropertyStub,
         JS_EnumerateStub, JS_ResolveStub , JS_ConvertStub, JS_FinalizeStub,
         JSCLASS_NO_OPTIONAL_MEMBERS
     };
-    
-    JSBool numberlong_constructor( JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval ){
+
+    JSBool numberlong_constructor( JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval ) {
         smuassert( cx , "NumberLong needs 0 or 1 args" , argc == 0 || argc == 1 );
-        
+
+        if ( ! JS_InstanceOf( cx , obj , &numberlong_class , 0 ) ) {
+            obj = JS_NewObject( cx , &numberlong_class , 0 , 0 );
+            CHECKNEWOBJECT( obj, cx, "numberlong_constructor" );
+            *rval = OBJECT_TO_JSVAL( obj );
+        }
+
         Convertor c( cx );
         if ( argc == 0 ) {
             c.setProperty( obj, "floatApprox", c.toval( 0.0 ) );
-        } else if ( JSVAL_IS_NUMBER( argv[ 0 ] ) ) {
+        }
+        else if ( JSVAL_IS_NUMBER( argv[ 0 ] ) ) {
             c.setProperty( obj, "floatApprox", argv[ 0 ] );
-        } else {
+        }
+        else {
             string num = c.toString( argv[ 0 ] );
             //PRINT(num);
             const char *numStr = num.c_str();
@@ -859,25 +896,26 @@ namespace mongo {
             try {
                 n = parseLL( numStr );
                 //PRINT(n);
-            } catch ( const AssertionException & ) {
-                smuassert( cx , "could not convert string to long long" , false );                
+            }
+            catch ( const AssertionException & ) {
+                smuassert( cx , "could not convert string to long long" , false );
             }
             c.makeLongObj( n, obj );
         }
-        
+
         return JS_TRUE;
     }
-    
-    JSBool numberlong_valueof(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval){    
+
+    JSBool numberlong_valueof(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) {
         Convertor c(cx);
-        return *rval = c.toval( double( c.toNumberLongUnsafe( obj ) ) );        
+        return *rval = c.toval( double( c.toNumberLongUnsafe( obj ) ) );
     }
-    
-    JSBool numberlong_tonumber(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval){    
+
+    JSBool numberlong_tonumber(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) {
         return numberlong_valueof( cx, obj, argc, argv, rval );
     }
 
-    JSBool numberlong_tostring(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval){    
+    JSBool numberlong_tostring(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) {
         Convertor c(cx);
         stringstream ss;
         long long val = c.toNumberLongUnsafe( obj );
@@ -893,12 +931,12 @@ namespace mongo {
     }
 
     JSFunctionSpec numberlong_functions[] = {
-    { "valueOf" , numberlong_valueof , 0 , JSPROP_READONLY | JSPROP_PERMANENT, 0 } ,
-    { "toNumber" , numberlong_tonumber , 0 , JSPROP_READONLY | JSPROP_PERMANENT, 0 } ,
-    { "toString" , numberlong_tostring , 0 , JSPROP_READONLY | JSPROP_PERMANENT, 0 } ,
-    { 0 }
-    };    
-    
+        { "valueOf" , numberlong_valueof , 0 , JSPROP_READONLY | JSPROP_PERMANENT, 0 } ,
+        { "toNumber" , numberlong_tonumber , 0 , JSPROP_READONLY | JSPROP_PERMANENT, 0 } ,
+        { "toString" , numberlong_tostring , 0 , JSPROP_READONLY | JSPROP_PERMANENT, 0 } ,
+        { 0 }
+    };
+
     JSClass minkey_class = {
         "MinKey" , JSCLASS_HAS_PRIVATE ,
         JS_PropertyStub, JS_PropertyStub, JS_PropertyStub, JS_PropertyStub,
@@ -912,12 +950,12 @@ namespace mongo {
         JS_EnumerateStub, JS_ResolveStub , JS_ConvertStub, JS_FinalizeStub,
         JSCLASS_NO_OPTIONAL_MEMBERS
     };
-    
+
     // dbquery
 
-    JSBool dbquery_constructor( JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval ){
+    JSBool dbquery_constructor( JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval ) {
         smuassert( cx ,  "DDQuery needs at least 4 args" , argc >= 4 );
-        
+
         Convertor c(cx);
         c.setProperty( obj , "_mongo" , argv[0] );
         c.setProperty( obj , "_db" , argv[1] );
@@ -931,28 +969,34 @@ namespace mongo {
             CHECKNEWOBJECT( temp, cx, "dbquery_constructor" );
             c.setProperty( obj , "_query" , OBJECT_TO_JSVAL( temp ) );
         }
-        
+
         if ( argc > 5 && JSVAL_IS_OBJECT( argv[5] ) )
             c.setProperty( obj , "_fields" , argv[5] );
         else
             c.setProperty( obj , "_fields" , JSVAL_NULL );
-        
-        
+
+
         if ( argc > 6 && JSVAL_IS_NUMBER( argv[6] ) )
             c.setProperty( obj , "_limit" , argv[6] );
-        else 
+        else
             c.setProperty( obj , "_limit" , JSVAL_ZERO );
-        
+
         if ( argc > 7 && JSVAL_IS_NUMBER( argv[7] ) )
             c.setProperty( obj , "_skip" , argv[7] );
-        else 
+        else
             c.setProperty( obj , "_skip" , JSVAL_ZERO );
 
         if ( argc > 8 && JSVAL_IS_NUMBER( argv[8] ) )
             c.setProperty( obj , "_batchSize" , argv[8] );
-        else 
+        else
             c.setProperty( obj , "_batchSize" , JSVAL_ZERO );
-        
+
+        if ( argc > 9 && JSVAL_IS_NUMBER( argv[9] ) )
+            c.setProperty( obj , "_options" , argv[8] );
+        else
+            c.setProperty( obj , "_options" , JSVAL_ZERO );
+
+
         c.setProperty( obj , "_cursor" , JSVAL_NULL );
         c.setProperty( obj , "_numReturned" , JSVAL_ZERO );
         c.setProperty( obj , "_special" , JSVAL_FALSE );
@@ -960,7 +1004,7 @@ namespace mongo {
         return JS_TRUE;
     }
 
-    JSBool dbquery_resolve( JSContext *cx, JSObject *obj, jsval id, uintN flags, JSObject **objp ){
+    JSBool dbquery_resolve( JSContext *cx, JSObject *obj, jsval id, uintN flags, JSObject **objp ) {
         if ( flags & JSRESOLVE_ASSIGNING )
             return JS_TRUE;
 
@@ -981,13 +1025,13 @@ namespace mongo {
         JS_EnumerateStub, (JSResolveOp)(&dbquery_resolve) , JS_ConvertStub, JS_FinalizeStub,
         JSCLASS_NO_OPTIONAL_MEMBERS
     };
-    
+
     // ---- other stuff ----
-    
-    void initMongoJS( SMScope * scope , JSContext * cx , JSObject * global , bool local ){
+
+    void initMongoJS( SMScope * scope , JSContext * cx , JSObject * global , bool local ) {
 
         assert( JS_InitClass( cx , global , 0 , &mongo_class , local ? mongo_local_constructor : mongo_external_constructor , 0 , 0 , mongo_functions , 0 , 0 ) );
-        
+
         assert( JS_InitClass( cx , global , 0 , &object_id_class , object_id_constructor , 0 , 0 , object_id_functions , 0 , 0 ) );
         assert( JS_InitClass( cx , global , 0 , &db_class , db_constructor , 2 , 0 , 0 , 0 , 0 ) );
         assert( JS_InitClass( cx , global , 0 , &db_collection_class , db_collection_constructor , 4 , 0 , 0 , 0 , 0 ) );
@@ -997,84 +1041,84 @@ namespace mongo {
         assert( JS_InitClass( cx , global , 0 , &bindata_class , bindata_constructor , 0 , 0 , bindata_functions , 0 , 0 ) );
         assert( JS_InitClass( cx , global , 0 , &uuid_class , uuid_constructor , 0 , 0 , uuid_functions , 0 , 0 ) );
 
-        assert( JS_InitClass( cx , global , 0 , &timestamp_class , 0 , 0 , 0 , 0 , 0 , 0 ) );
+        assert( JS_InitClass( cx , global , 0 , &timestamp_class , timestamp_constructor , 0 , 0 , 0 , 0 , 0 ) );
         assert( JS_InitClass( cx , global , 0 , &numberlong_class , numberlong_constructor , 0 , 0 , numberlong_functions , 0 , 0 ) );
         assert( JS_InitClass( cx , global , 0 , &minkey_class , 0 , 0 , 0 , 0 , 0 , 0 ) );
         assert( JS_InitClass( cx , global , 0 , &maxkey_class , 0 , 0 , 0 , 0 , 0 , 0 ) );
 
         assert( JS_InitClass( cx , global , 0 , &map_class , map_constructor , 0 , 0 , map_functions , 0 , 0 ) );
-        
+
         assert( JS_InitClass( cx , global , 0 , &bson_ro_class , bson_cons , 0 , 0 , bson_functions , 0 , 0 ) );
         assert( JS_InitClass( cx , global , 0 , &bson_class , bson_cons , 0 , 0 , bson_functions , 0 , 0 ) );
-        
+
         static const char *dbrefName = "DBRef";
         dbref_class.name = dbrefName;
         assert( JS_InitClass( cx , global , 0 , &dbref_class , dbref_constructor , 2 , 0 , bson_functions , 0 , 0 ) );
-        
-        scope->exec( jsconcatcode );
+
+        scope->execCoreFiles();
     }
 
-    bool appendSpecialDBObject( Convertor * c , BSONObjBuilder& b , const string& name , jsval val , JSObject * o ){
-        
-        if ( JS_InstanceOf( c->_context , o , &object_id_class , 0 ) ){
+    bool appendSpecialDBObject( Convertor * c , BSONObjBuilder& b , const string& name , jsval val , JSObject * o ) {
+
+        if ( JS_InstanceOf( c->_context , o , &object_id_class , 0 ) ) {
             OID oid;
             oid.init( c->getString( o , "str" ) );
             b.append( name , oid );
             return true;
         }
 
-        if ( JS_InstanceOf( c->_context , o , &minkey_class , 0 ) ){
+        if ( JS_InstanceOf( c->_context , o , &minkey_class , 0 ) ) {
             b.appendMinKey( name );
             return true;
         }
 
-        if ( JS_InstanceOf( c->_context , o , &maxkey_class , 0 ) ){
+        if ( JS_InstanceOf( c->_context , o , &maxkey_class , 0 ) ) {
             b.appendMaxKey( name );
             return true;
         }
-        
-        if ( JS_InstanceOf( c->_context , o , &timestamp_class , 0 ) ){
+
+        if ( JS_InstanceOf( c->_context , o , &timestamp_class , 0 ) ) {
             b.appendTimestamp( name , (unsigned long long)c->getNumber( o , "t" ) , (unsigned int )c->getNumber( o , "i" ) );
             return true;
         }
 
-        if ( JS_InstanceOf( c->_context , o , &numberlong_class , 0 ) ){
+        if ( JS_InstanceOf( c->_context , o , &numberlong_class , 0 ) ) {
             b.append( name , c->toNumberLongUnsafe( o ) );
             return true;
         }
-        
-        if ( JS_InstanceOf( c->_context , o , &dbpointer_class , 0 ) ){
-            b.appendDBRef( name , c->getString( o , "ns" ).c_str() , c->toOID( c->getProperty( o , "id" ) ) );
+
+        if ( JS_InstanceOf( c->_context , o , &dbpointer_class , 0 ) ) {
+            b.appendDBRef( name , c->getString( o , "ns" ) , c->toOID( c->getProperty( o , "id" ) ) );
             return true;
         }
-        
-        if ( JS_InstanceOf( c->_context , o , &bindata_class , 0 ) ){
+
+        if ( JS_InstanceOf( c->_context , o , &bindata_class , 0 ) ) {
             void *holder = JS_GetPrivate( c->_context , o );
             const char *data = ( ( BinDataHolder * )( holder ) )->c_;
-            b.appendBinData( name , 
-                             (int)(c->getNumber( o , "len" )) , (BinDataType)((char)(c->getNumber( o , "type" ) ) ) , 
+            b.appendBinData( name ,
+                             (int)(c->getNumber( o , "len" )) , (BinDataType)((char)(c->getNumber( o , "type" ) ) ) ,
                              data
-                             );
+                           );
             return true;
         }
-        
+
 #if defined( SM16 ) || defined( MOZJS )
 #warning dates do not work in your version of spider monkey
         {
             jsdouble d = js_DateGetMsecSinceEpoch( c->_context , o );
-            if ( d ){
+            if ( d ) {
                 b.appendDate( name , Date_t(d) );
                 return true;
             }
         }
 #elif defined( XULRUNNER )
-        if ( JS_InstanceOf( c->_context , o, globalSMEngine->_dateClass , 0 ) ){
+        if ( JS_InstanceOf( c->_context , o, globalSMEngine->_dateClass , 0 ) ) {
             jsdouble d = js_DateGetMsecSinceEpoch( c->_context , o );
             b.appendDate( name , Date_t(d) );
             return true;
         }
 #else
-        if ( JS_InstanceOf( c->_context , o, &js_DateClass , 0 ) ){
+        if ( JS_InstanceOf( c->_context , o, &js_DateClass , 0 ) ) {
             jsdouble d = js_DateGetMsecSinceEpoch( c->_context , o );
             //TODO: make signed
             b.appendDate( name , Date_t((unsigned long long)d) );
@@ -1082,35 +1126,35 @@ namespace mongo {
         }
 #endif
 
-        
+
         if ( JS_InstanceOf( c->_context , o , &dbquery_class , 0 ) ||
-             JS_InstanceOf( c->_context , o , &mongo_class , 0 ) || 
-             JS_InstanceOf( c->_context , o , &db_collection_class , 0 ) ){
+                JS_InstanceOf( c->_context , o , &mongo_class , 0 ) ||
+                JS_InstanceOf( c->_context , o , &db_collection_class , 0 ) ) {
             b.append( name , c->toString( val ) );
             return true;
         }
 
-#if defined( XULRUNNER ) 
-        if ( JS_InstanceOf( c->_context , o , globalSMEngine->_regexClass , 0 ) ){
+#if defined( XULRUNNER )
+        if ( JS_InstanceOf( c->_context , o , globalSMEngine->_regexClass , 0 ) ) {
             c->appendRegex( b , name , c->toString( val ) );
             return true;
         }
-#elif defined( SM18 ) 
-        if ( JS_InstanceOf( c->_context , o , &js_RegExpClass , 0 ) ){
+#elif defined( SM18 )
+        if ( JS_InstanceOf( c->_context , o , &js_RegExpClass , 0 ) ) {
             c->appendRegex( b , name , c->toString( val ) );
             return true;
         }
 #endif
-        
+
         return false;
     }
 
-    bool isDate( JSContext * cx , JSObject * o ){
+    bool isDate( JSContext * cx , JSObject * o ) {
 #if defined( SM16 ) || defined( MOZJS ) || defined( XULRUNNER )
         return js_DateGetMsecSinceEpoch( cx , o ) != 0;
 #else
         return JS_InstanceOf( cx , o, &js_DateClass, 0 );
 #endif
     }
-    
+
 }