From 6e583abbc2afc3010bee432868b71ed5cfa1f5d8 Mon Sep 17 00:00:00 2001
From: Massimo Di Pierro <mdipierro@OfficeMacPro.local>
Date: Mon, 7 May 2012 15:27:32 -0500
Subject: [PATCH] mongodb fix?

---
 VERSION      |  2 +-
 gluon/dal.py | 24 +++++++++++-------------
 2 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/VERSION b/VERSION
index 1effe38f..e01800b4 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-Version 1.99.7 (2012-05-07 12:17:32) dev
+Version 1.99.7 (2012-05-07 15:26:56) dev
diff --git a/gluon/dal.py b/gluon/dal.py
index b3a49ba9..e250a848 100644
--- a/gluon/dal.py
+++ b/gluon/dal.py
@@ -4674,7 +4674,7 @@ class MongoDBAdapter(NoSQLAdapter):
         withId=False
         tablename, mongoqry_dict , mongofields_dict, mongosort_list, limitby_limit, limitby_skip = self._select(query,fields,attributes)
         for key in mongofields_dict.keys():
-            if key == 'id':
+            if key == 'id'
                 withId =  True
                 break;
         try:
@@ -4684,21 +4684,21 @@ class MongoDBAdapter(NoSQLAdapter):
         print "mongofields_dict=%s" % mongofields_dict
         ctable = self.connection[tablename]
         if count:
-            return {'count' : ctable.find(mongoqry_dict,mongofields_dict,skip=limitby_skip, limit=limitby_limit, sort=mongosort_list,snapshot=snapshot).count()}
+            return {'count' : ctable.find(mongoqry_dict,mongofields_dict,
+                                          skip=limitby_skip, limit=limitby_limit,
+                                          sort=mongosort_list,snapshot=snapshot).count()}
         else:
-            mongo_list_dicts = ctable.find(mongoqry_dict,mongofields_dict,skip=limitby_skip, limit=limitby_limit, sort=mongosort_list,snapshot=snapshot) # pymongo cursor object
+            mongo_list_dicts = ctable.find(mongoqry_dict,mongofields_dict,
+                                           skip=limitby_skip, limit=limitby_limit,
+                                           sort=mongosort_list,snapshot=snapshot) # pymongo cursor object
         print "mongo_list_dicts=%s" % mongo_list_dicts
-        #if mongo_list_dicts.count() > 0: #
-            #colnames = mongo_list_dicts[0].keys() # assuming all docs have same "shape", grab colnames from first dictionary (aka row)
-        #else:
-            #colnames = mongofields_dict.keys()
-        #print "colnames = %s" % colnames
-        #rows = [row.values() for row in mongo_list_dicts]
         rows = []
+        columns = []
         for record in mongo_list_dicts:
             row=[]
             for column in record:
-                if withId and (column == '_id'):
+                columns.append(column)
+                if withId and (column == '_id'):                    
                     if isinstance(record[column],pymongo.objectid.ObjectId):
                         row.append( int(str(record[column]),16))
                     else:
@@ -4707,10 +4707,8 @@ class MongoDBAdapter(NoSQLAdapter):
                 elif not (column == '_id'):
                     row.append(record[column])
             rows.append(row)
-                    #else the id is not supposed to be included. Work around error. mongo always sends key:(
-
         processor = attributes.get('processor',self.parse)
-        return processor(rows,fields,mongofields_dict.keys(),False)
+        return processor(rows,columns,False)
 
     def INVERT(self,first):
         #print "in invert first=%s" % first