Refactoring frontend js

venatir · May 19, 2014 · f3f6feb · f3f6feb
1 parent e25265a
commit f3f6feb
Show file tree

Hide file tree

Showing 3 changed files with 593 additions and 722 deletions.
diff --git a/bin/generator-config.js b/bin/generator-config.js
diff --git a/lib/analytics/genericGetter.js b/lib/analytics/genericGetter.js
@@ -2,7 +2,8 @@
 var myutils = require("./myutils.js"),
     mongodb = require("mongodb"),
     type_re = /^[a-z][a-zA-Z0-9_]+$/,
-    MAX_RETURNED_RECORDS = 10000;
+    MAX_RETURNED_RECORDS = 10000,
+    util = require("util");
 function customQuery(collectionObj, filter, sort, limit, batchSize, streamified, documentHandler) {
     // set MongoDB cursor options
     var cursorOptions = {},
@@ -28,8 +29,7 @@ function customQuery(collectionObj, filter, sort, limit, batchSize, streamified,
     if (streamified) {
         stream = cursor.sort({$natural: -1}).stream();
         stream.on('data', function (document) {
-            document.time = document.t;
-            document.data = (document.d === undefined ? document.key : document.d);
+            document.d = (document.d === undefined ? document.key : document.d);
             documentHandler(document);
         });
     }
@@ -52,7 +52,8 @@ function customQuery(collectionObj, filter, sort, limit, batchSize, streamified,
 
             // A null name indicates that there are no more results.
             if (document) {
-                documentHandler({id: document._id, time: document.t, data: (document.d === undefined ? document.key : document.d)});
+                document.d = (document.d === undefined ? document.key : document.d);
+                documentHandler(document);
             }
             else {
                 documentHandler(null);
@@ -160,6 +161,7 @@ module.exports = function (db) {
                             if (document) {
                                 streams.active.forEach(function (documentHandler) {
                                     if (!documentHandler.closed) {
+                                        console.log("document handled: " + util.inspect(document, {colors: true, depth: null}));
                                         documentHandler(document);
                                     }
                                 });