[MongoDB] Several fixes so we can create a simple BsonDocument and sa…

…ve it successfully to the DB
Whiteknight · Apr 15, 2012 · 32146e0 · 32146e0
1 parent a09b843
commit 32146e0
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 10 deletions.
diff --git a/Makefile b/Makefile
@@ -1,5 +1,4 @@
 all: memcached mysql mongodb
-	echo "MAKE ALL"
 
 clean: clean_memcached clean_mongodb clean_mysql
 
@@ -20,9 +19,7 @@ parrotstore/memcached.pbc: memcached/
 
 ## MongoDB
 
-mongodb: mongodb/*.winxed mongodb/pmc/*.pmc mongodb/include/*.h dynext/mongodb_group.so
-
-dynext/mongodb_group.so:
+mongodb:
 	winxed setup.winxed mongodb build
 
 clean_mongodb:

diff --git a/mongodb/include/ps_mongodb.h b/mongodb/include/ps_mongodb.h
@@ -1,6 +1,7 @@
 
 #define STRING_TO_CSTRING(i, s, c, code) do { \
     char * (c) = Parrot_str_to_cstring((i), (s)); \
+    fprintf(stderr, "Connecting to server '%s'", (c)); \
     { \
         code \
     } \

diff --git a/mongodb/pmc/bsondocument.pmc b/mongodb/pmc/bsondocument.pmc
@@ -57,7 +57,7 @@ pmclass BsonDocument dynpmc auto_attrs {
         );
     }
 
-    METHOD append_finish_object(STRING *name)
+    METHOD append_finish_object()
     {
         bson_append_finish_object(GET_BSON(SELF));
     }

diff --git a/mongodb/pmc/mongodbcontext.pmc b/mongodb/pmc/mongodbcontext.pmc
@@ -6,7 +6,7 @@ pmclass MongoDbContext dynpmc auto_attrs {
     ATTR void *conn;
 
     VTABLE void init() {
-        mongo * conn = (mongo *)malloc(sizeof(conn));
+        mongo * conn = (mongo *)malloc(sizeof(mongo));
         PARROT_MONGODBCONTEXT(SELF)->conn = conn;
     }
 
@@ -21,10 +21,8 @@ pmclass MongoDbContext dynpmc auto_attrs {
     METHOD connect(STRING * server, INTVAL port)
     {
         mongo * conn = GET_CONN(SELF);
-        INTVAL stat;
-        STRING_TO_CSTRING(INTERP, server, cserver, {
-            stat = mongo_connect(conn, cserver, port);
-        });
+        char * const cserver = Parrot_str_to_cstring(INTERP, server);
+        INTVAL stat = mongo_connect(conn, cserver, port);
         if (stat) {
             switch(conn->err) {
                 case MONGO_CONN_NO_SOCKET: