Index: library/mongodb/mongoAPI.h
===================================================================
diff -u -N -r5b61f8a3e6a8142e1553f50d2010439089e1cd0d -rdf67ed7db2b0cda881c4a9e704379a2a02d415b6
--- library/mongodb/mongoAPI.h	(.../mongoAPI.h)	(revision 5b61f8a3e6a8142e1553f50d2010439089e1cd0d)
+++ library/mongodb/mongoAPI.h	(.../mongoAPI.h)	(revision df67ed7db2b0cda881c4a9e704379a2a02d415b6)
@@ -4,16 +4,21 @@
 static Nsf_methodDefinition method_definitions[];
   
 static CONST char *method_command_namespace_names[] = {
-  "::nsf::methods::object::info",
-  "::nsf::methods::object",
-  "::mongo",
-  "::nsf::cmd::ParameterType",
-  "::nsf::methods::class::info",
-  "::nsf::methods::class"
+  "::mongo"
 };
 static int NsfMongoCloseStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv []);
 static int NsfMongoConnectStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv []);
 static int NsfMongoCountStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv []);
+static int NsfMongoGridFSCloseStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv []);
+static int NsfMongoGridFSOpenStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv []);
+static int NsfMongoGridFSRemoveFileStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv []);
+static int NsfMongoGridFSStoreFileStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv []);
+static int NsfMongoGridFileCloseStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv []);
+static int NsfMongoGridFileGetContentTypeStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv []);
+static int NsfMongoGridFileGetContentlengthStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv []);
+static int NsfMongoGridFileGetMetaDataStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv []);
+static int NsfMongoGridFileOpenStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv []);
+static int NsfMongoGridFileReadStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv []);
 static int NsfMongoIndexStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv []);
 static int NsfMongoInsertStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv []);
 static int NsfMongoQueryStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv []);
@@ -23,6 +28,16 @@
 static int NsfMongoClose(Tcl_Interp *interp, Tcl_Obj *conn);
 static int NsfMongoConnect(Tcl_Interp *interp, CONST char *withReplica_set, Tcl_Obj *withServer);
 static int NsfMongoCount(Tcl_Interp *interp, Tcl_Obj *conn, CONST char *namespace, Tcl_Obj *query);
+static int NsfMongoGridFSClose(Tcl_Interp *interp, Tcl_Obj *gfs);
+static int NsfMongoGridFSOpen(Tcl_Interp *interp, Tcl_Obj *conn, CONST char *dbname, CONST char *prefix);
+static int NsfMongoGridFSRemoveFile(Tcl_Interp *interp, Tcl_Obj *gfs, CONST char *filename);
+static int NsfMongoGridFSStoreFile(Tcl_Interp *interp, Tcl_Obj *gfs, CONST char *filename, CONST char *remotename, CONST char *contenttype);
+static int NsfMongoGridFileClose(Tcl_Interp *interp, Tcl_Obj *gridfile);
+static int NsfMongoGridFileGetContentType(Tcl_Interp *interp, Tcl_Obj *gridfile);
+static int NsfMongoGridFileGetContentlength(Tcl_Interp *interp, Tcl_Obj *gridfile);
+static int NsfMongoGridFileGetMetaData(Tcl_Interp *interp, Tcl_Obj *gridfile);
+static int NsfMongoGridFileOpen(Tcl_Interp *interp, Tcl_Obj *gfs, CONST char *filename);
+static int NsfMongoGridFileRead(Tcl_Interp *interp, Tcl_Obj *gridfile, int size);
 static int NsfMongoIndex(Tcl_Interp *interp, Tcl_Obj *conn, CONST char *namespace, Tcl_Obj *attributes, int withDropdups, int withUnique);
 static int NsfMongoInsert(Tcl_Interp *interp, Tcl_Obj *conn, CONST char *namespace, Tcl_Obj *values);
 static int NsfMongoQuery(Tcl_Interp *interp, Tcl_Obj *conn, CONST char *namespace, Tcl_Obj *query, Tcl_Obj *withAtts, int withLimit, int withSkip);
@@ -33,6 +48,16 @@
  NsfMongoCloseIdx,
  NsfMongoConnectIdx,
  NsfMongoCountIdx,
+ NsfMongoGridFSCloseIdx,
+ NsfMongoGridFSOpenIdx,
+ NsfMongoGridFSRemoveFileIdx,
+ NsfMongoGridFSStoreFileIdx,
+ NsfMongoGridFileCloseIdx,
+ NsfMongoGridFileGetContentTypeIdx,
+ NsfMongoGridFileGetContentlengthIdx,
+ NsfMongoGridFileGetMetaDataIdx,
+ NsfMongoGridFileOpenIdx,
+ NsfMongoGridFileReadIdx,
  NsfMongoIndexIdx,
  NsfMongoInsertIdx,
  NsfMongoQueryIdx,
@@ -99,6 +124,189 @@
 }
 
 static int
+NsfMongoGridFSCloseStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[]) {
+  (void)clientData;
+
+    
+
+      if (objc != 2) {
+	return NsfArgumentError(interp, "wrong # of arguments:", 
+			     method_definitions[NsfMongoGridFSCloseIdx].paramDefs,
+			     NULL, objv[0]); 
+      }
+    
+    return NsfMongoGridFSClose(interp, objc == 2 ? objv[1] : NULL);
+
+}
+
+static int
+NsfMongoGridFSOpenStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[]) {
+  ParseContext pc;
+  (void)clientData;
+
+  if (ArgumentParse(interp, objc, objv, NULL, objv[0], 
+                     method_definitions[NsfMongoGridFSOpenIdx].paramDefs, 
+                     method_definitions[NsfMongoGridFSOpenIdx].nrParameters, 1,
+                     &pc) != TCL_OK) {
+    return TCL_ERROR;
+  } else {
+    Tcl_Obj *conn = (Tcl_Obj *)pc.clientData[0];
+    CONST char *dbname = (CONST char *)pc.clientData[1];
+    CONST char *prefix = (CONST char *)pc.clientData[2];
+
+    assert(pc.status == 0);
+    return NsfMongoGridFSOpen(interp, conn, dbname, prefix);
+
+  }
+}
+
+static int
+NsfMongoGridFSRemoveFileStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[]) {
+  ParseContext pc;
+  (void)clientData;
+
+  if (ArgumentParse(interp, objc, objv, NULL, objv[0], 
+                     method_definitions[NsfMongoGridFSRemoveFileIdx].paramDefs, 
+                     method_definitions[NsfMongoGridFSRemoveFileIdx].nrParameters, 1,
+                     &pc) != TCL_OK) {
+    return TCL_ERROR;
+  } else {
+    Tcl_Obj *gfs = (Tcl_Obj *)pc.clientData[0];
+    CONST char *filename = (CONST char *)pc.clientData[1];
+
+    assert(pc.status == 0);
+    return NsfMongoGridFSRemoveFile(interp, gfs, filename);
+
+  }
+}
+
+static int
+NsfMongoGridFSStoreFileStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[]) {
+  ParseContext pc;
+  (void)clientData;
+
+  if (ArgumentParse(interp, objc, objv, NULL, objv[0], 
+                     method_definitions[NsfMongoGridFSStoreFileIdx].paramDefs, 
+                     method_definitions[NsfMongoGridFSStoreFileIdx].nrParameters, 1,
+                     &pc) != TCL_OK) {
+    return TCL_ERROR;
+  } else {
+    Tcl_Obj *gfs = (Tcl_Obj *)pc.clientData[0];
+    CONST char *filename = (CONST char *)pc.clientData[1];
+    CONST char *remotename = (CONST char *)pc.clientData[2];
+    CONST char *contenttype = (CONST char *)pc.clientData[3];
+
+    assert(pc.status == 0);
+    return NsfMongoGridFSStoreFile(interp, gfs, filename, remotename, contenttype);
+
+  }
+}
+
+static int
+NsfMongoGridFileCloseStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[]) {
+  (void)clientData;
+
+    
+
+      if (objc != 2) {
+	return NsfArgumentError(interp, "wrong # of arguments:", 
+			     method_definitions[NsfMongoGridFileCloseIdx].paramDefs,
+			     NULL, objv[0]); 
+      }
+    
+    return NsfMongoGridFileClose(interp, objc == 2 ? objv[1] : NULL);
+
+}
+
+static int
+NsfMongoGridFileGetContentTypeStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[]) {
+  (void)clientData;
+
+    
+
+      if (objc != 2) {
+	return NsfArgumentError(interp, "wrong # of arguments:", 
+			     method_definitions[NsfMongoGridFileGetContentTypeIdx].paramDefs,
+			     NULL, objv[0]); 
+      }
+    
+    return NsfMongoGridFileGetContentType(interp, objc == 2 ? objv[1] : NULL);
+
+}
+
+static int
+NsfMongoGridFileGetContentlengthStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[]) {
+  (void)clientData;
+
+    
+
+      if (objc != 2) {
+	return NsfArgumentError(interp, "wrong # of arguments:", 
+			     method_definitions[NsfMongoGridFileGetContentlengthIdx].paramDefs,
+			     NULL, objv[0]); 
+      }
+    
+    return NsfMongoGridFileGetContentlength(interp, objc == 2 ? objv[1] : NULL);
+
+}
+
+static int
+NsfMongoGridFileGetMetaDataStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[]) {
+  (void)clientData;
+
+    
+
+      if (objc != 2) {
+	return NsfArgumentError(interp, "wrong # of arguments:", 
+			     method_definitions[NsfMongoGridFileGetMetaDataIdx].paramDefs,
+			     NULL, objv[0]); 
+      }
+    
+    return NsfMongoGridFileGetMetaData(interp, objc == 2 ? objv[1] : NULL);
+
+}
+
+static int
+NsfMongoGridFileOpenStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[]) {
+  ParseContext pc;
+  (void)clientData;
+
+  if (ArgumentParse(interp, objc, objv, NULL, objv[0], 
+                     method_definitions[NsfMongoGridFileOpenIdx].paramDefs, 
+                     method_definitions[NsfMongoGridFileOpenIdx].nrParameters, 1,
+                     &pc) != TCL_OK) {
+    return TCL_ERROR;
+  } else {
+    Tcl_Obj *gfs = (Tcl_Obj *)pc.clientData[0];
+    CONST char *filename = (CONST char *)pc.clientData[1];
+
+    assert(pc.status == 0);
+    return NsfMongoGridFileOpen(interp, gfs, filename);
+
+  }
+}
+
+static int
+NsfMongoGridFileReadStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[]) {
+  ParseContext pc;
+  (void)clientData;
+
+  if (ArgumentParse(interp, objc, objv, NULL, objv[0], 
+                     method_definitions[NsfMongoGridFileReadIdx].paramDefs, 
+                     method_definitions[NsfMongoGridFileReadIdx].nrParameters, 1,
+                     &pc) != TCL_OK) {
+    return TCL_ERROR;
+  } else {
+    Tcl_Obj *gridfile = (Tcl_Obj *)pc.clientData[0];
+    int size = (int )PTR2INT(pc.clientData[1]);
+
+    assert(pc.status == 0);
+    return NsfMongoGridFileRead(interp, gridfile, size);
+
+  }
+}
+
+static int
 NsfMongoIndexStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[]) {
   ParseContext pc;
   (void)clientData;
@@ -224,6 +432,44 @@
   {"namespace", NSF_ARG_REQUIRED, 1, Nsf_ConvertToString, NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL},
   {"query", NSF_ARG_REQUIRED, 1, Nsf_ConvertToTclobj, NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL}}
 },
+{"::mongo::gridfs::close", NsfMongoGridFSCloseStub, 1, {
+  {"gfs", NSF_ARG_REQUIRED, 1, Nsf_ConvertToTclobj, NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL}}
+},
+{"::mongo::gridfs::open", NsfMongoGridFSOpenStub, 3, {
+  {"conn", NSF_ARG_REQUIRED, 1, Nsf_ConvertToTclobj, NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL},
+  {"dbname", NSF_ARG_REQUIRED, 1, Nsf_ConvertToString, NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL},
+  {"prefix", NSF_ARG_REQUIRED, 1, Nsf_ConvertToString, NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL}}
+},
+{"::mongo::gridfs::remove_file", NsfMongoGridFSRemoveFileStub, 2, {
+  {"gfs", NSF_ARG_REQUIRED, 1, Nsf_ConvertToTclobj, NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL},
+  {"filename", NSF_ARG_REQUIRED, 1, Nsf_ConvertToString, NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL}}
+},
+{"::mongo::gridfs::store_file", NsfMongoGridFSStoreFileStub, 4, {
+  {"gfs", NSF_ARG_REQUIRED, 1, Nsf_ConvertToTclobj, NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL},
+  {"filename", NSF_ARG_REQUIRED, 1, Nsf_ConvertToString, NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL},
+  {"remotename", NSF_ARG_REQUIRED, 1, Nsf_ConvertToString, NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL},
+  {"contenttype", NSF_ARG_REQUIRED, 1, Nsf_ConvertToString, NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL}}
+},
+{"::mongo::gridfile::close", NsfMongoGridFileCloseStub, 1, {
+  {"gridfile", NSF_ARG_REQUIRED, 1, Nsf_ConvertToTclobj, NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL}}
+},
+{"::mongo::gridfile::get_contenttype", NsfMongoGridFileGetContentTypeStub, 1, {
+  {"gridfile", NSF_ARG_REQUIRED, 1, Nsf_ConvertToTclobj, NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL}}
+},
+{"::mongo::gridfile::get_contentlength", NsfMongoGridFileGetContentlengthStub, 1, {
+  {"gridfile", NSF_ARG_REQUIRED, 1, Nsf_ConvertToTclobj, NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL}}
+},
+{"::mongo::gridfile::get_metadata", NsfMongoGridFileGetMetaDataStub, 1, {
+  {"gridfile", NSF_ARG_REQUIRED, 1, Nsf_ConvertToTclobj, NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL}}
+},
+{"::mongo::gridfile::open", NsfMongoGridFileOpenStub, 2, {
+  {"gfs", NSF_ARG_REQUIRED, 1, Nsf_ConvertToTclobj, NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL},
+  {"filename", NSF_ARG_REQUIRED, 1, Nsf_ConvertToString, NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL}}
+},
+{"::mongo::gridfile::read", NsfMongoGridFileReadStub, 2, {
+  {"gridfile", NSF_ARG_REQUIRED, 1, Nsf_ConvertToTclobj, NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL},
+  {"size", NSF_ARG_REQUIRED, 1, Nsf_ConvertToInt32, NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL}}
+},
 {"::mongo::index", NsfMongoIndexStub, 5, {
   {"conn", NSF_ARG_REQUIRED, 1, Nsf_ConvertToTclobj, NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL},
   {"namespace", NSF_ARG_REQUIRED, 1, Nsf_ConvertToString, NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL},