Fix conflicts and fix some error-appends.

BUGZID:
flightaware · Feb 12, 2014 · 4b2aa01 · 4b2aa01
1 parent 006d555
commit 4b2aa01
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 12 deletions.
diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-This is MongoTcl, a Tcl C extension providing an interface to the MongoDB C driver.
+MongoTcl, a Tcl C extension providing a Tcl interface to the MongoDB database
 ===
 
 MongoTcl provides a Tcl interface to the MongoDB C API.
@@ -37,8 +37,6 @@ MongoTcl provides three object creation commands...
 BSON object
 ---
 
-status: constructing bson is solid.  deconstructing it is untested to nonexistent.
-
 BSON stands for Binary JSON, is a binary-encoded serialization of JSON-like documents.  It has a JSON-like structure but is extended to support data types beyond the JSON spec, like it has a binary data type.
 
 It's intended to be lightweight, traversable and efficient and it's the primary data representation for MongoDB.

diff --git a/generic/mongotcl.c b/generic/mongotcl.c
@@ -932,12 +932,12 @@ mongotcl_mongoObjectObjCmd(ClientData cData, Tcl_Interp *interp, int objc, Tcl_O
 			ns = Tcl_GetString (objv[2]);
 
 			if (mongotcl_cmdNameObjToBson (interp, objv[3], &bsonQuery) == TCL_ERROR) {
-				Tcl_AddErrorInfo (interp, "while locating query bson");
+				Tcl_AddErrorInfo (interp, " while locating query bson");
 				return TCL_ERROR;
 			}
 
 			if (mongotcl_cmdNameObjToBson (interp, objv[4], &bsonFields) == TCL_ERROR) {
-				Tcl_AddErrorInfo (interp, "while locating query bson");
+				Tcl_AddErrorInfo (interp, " while locating query bson");
 				return TCL_ERROR;
 			}
 
@@ -1130,12 +1130,12 @@ mongotcl_mongoObjectObjCmd(ClientData cData, Tcl_Interp *interp, int objc, Tcl_O
 			}
 
 			if (mongotcl_cmdNameObjToBson (interp, objv[3], &keyBson) == TCL_ERROR) {
-				Tcl_AddErrorInfo (interp, "while locating key bson");
+				Tcl_AddErrorInfo (interp, " while locating key bson");
 				return TCL_ERROR;
 			}
 
 			if (mongotcl_cmdNameObjToBson (interp, objv[4], &outBson) == TCL_ERROR) {
-				Tcl_AddErrorInfo (interp, "while locating ultson");
+				Tcl_AddErrorInfo (interp, " while locating ultson");
 				return TCL_ERROR;
 			}
 
@@ -1226,7 +1226,7 @@ mongotcl_mongoObjectObjCmd(ClientData cData, Tcl_Interp *interp, int objc, Tcl_O
 			}
 
 			if (mongotcl_cmdNameObjToBson (interp, objv[3], &bsonResult) == TCL_ERROR) {
-				Tcl_AddErrorInfo (interp, "while locating bson result object");
+				Tcl_AddErrorInfo (interp, " while locating bson result object");
 				return TCL_ERROR;
 			}
 

diff --git a/test.tcl b/test.tcl
@@ -8,12 +8,12 @@ m client 127.0.0.1 27017
 
 ::mongo::bson create b
 
-b init string "name" "Joe" int "age" 33 finish
+#b init string "name" "Joe" int "age" 33 finish
 
-b print
+#b print
 
-m insert "tutorial.persons" b
+#m insert "tutorial.persons" b
 
-puts "hi"
+#puts "hi"
 
 # vim: set ts=4 sw=4 sts=4 noet :