REVISION CONTROL

lib/helperLib.js

@@ -14,6 +14,8 @@ var sessionStore = new MemoryStore();
 var io;
 var online = [];
 var lastExchangeData = {};
+var makeCommit = require("./makeCommit.js").makeCommit; 
+var getAndSendRevHistory = require("./revAlgorithm.js").getAndSendRevHistory; 
 
 
 console.log("\n\nLOOK HERE!!")
@@ -32,11 +34,7 @@ module.exports = {
   // },
   createUser: function(username, password, callback){
     User.addUser(username, password, callback);
-  }, 
-
-  getNodes: function(){
-    return Node.findNodes();
-  }, 
+  },  
 
   getSessionStore: function(){
     return sessionStore;
@@ -46,9 +44,18 @@ module.exports = {
     io = require('socket.io').listen(server);
     io.sockets.on('connection', function(socket){
 
+      socket.on("COMMIT", function(){
+        makeCommit(); 
+        socket.emit("commitReceived"); 
+      }); 
+
+      socket.on("revHistoryRequest", function(){
+        getAndSendRevHistory(null, socket); 
+      }); 
+
       //socket.emit('news', {hello: "world"}); 
       socket.on('nodeRequest', function(data){
-        var nodes = Node.findNodes(socket); //finds, then sends through socket. 
+        var nodes = Node.findAndSendSocket(socket); //finds, then sends through socket. 
         //var nodes = {'keep': 'calm'};
         //socket.emit('nodeData', nodes); (emit is in findNodes);
       })
@@ -69,7 +76,7 @@ module.exports = {
 
 
       socket.on("blurred", function(data){
-        console.log('\nBLURRED\n')
+        // console.log('\nBLURRED\n')
         socket.broadcast.emit("blurred", data);
         var id = data[0];
         var text = data[1];
@@ -111,6 +118,7 @@ module.exports = {
       });
 
       socket.on("removeNode", function(data){
+        // console.log("removeNode!!!"); 
         var thisId = data[0];
         var thisIndex = data[1];
         var parId = data[2];