Skip to content

Commit

Permalink
Condensed code for readability
Browse files Browse the repository at this point in the history
  • Loading branch information
Gregory Thompson committed Jul 1, 2013
1 parent 9d1524c commit 24df88d
Showing 1 changed file with 12 additions and 31 deletions.
43 changes: 12 additions & 31 deletions lib/node_operations.js
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@ function isArrayLike(data){
return _.has(value, key)
});
});

}

function addDataObjects(nodeObject, objects, callback, failCallback){
Expand All @@ -34,11 +33,8 @@ function addDataObjects(nodeObject, objects, callback, failCallback){
var objectKey = pairs[0];
var objectValue = pairs[1];
var dataName = "#" + objectKey;
insertNode(dataName, childPaths(nodeObject), [], [], objectValue, function(){
iterCallback()
}, function(){
iterCallback(new Error("iteration error"));
});
insertNode(dataName, childPaths(nodeObject), [], [], objectValue, function(){ iterCallback(); },
function(){ iterCallback(new Error("iteration error")); });
},
function(err){
if(err) { failCallback(err); }
Expand Down Expand Up @@ -93,9 +89,7 @@ function nodeCanBeInserted(name, nodePath, callback){
}
}

function childPaths(node){
return (node.path !== null ? node.path : ",") + node.name + ",";
}
function childPaths(node){ return (node.path !== null ? node.path : ",") + node.name + ","; }

var findNodeDataObject = function(currentNode, callback, failCallback){
Node.find({path: childPaths(currentNode), name: /^#/}, function(err, childNodes){
Expand All @@ -112,9 +106,7 @@ var findNodeDataObject = function(currentNode, callback, failCallback){
childDataObject.push(childData);
iterCallback(null, childDataObject);
},
function(){
iterCallback(new Error("iteration error"), null);
}
function(){ iterCallback(new Error("iteration error"), null); }
);
},
function(err, objectArray){
Expand All @@ -126,7 +118,7 @@ var findNodeDataObject = function(currentNode, callback, failCallback){
});
}

//visible function
//////////////////////////////////visible functions//////////////////////////////////
var insertNode = function(name, parentNodePath, tags, unique, data, callback, failCallback){
var nodeMetaData = createNodeMetadata(name, parentNodePath, tags, unique);

Expand Down Expand Up @@ -160,7 +152,7 @@ var findNode = function(path, callback, failCallback){

Node.findOne({name: pathParts.nodeName, path: pathParts.pathToNode}, function(err, node){
if(err){failCallback(err); }
else{callback(node); }
else{ callback(node); }
});
}
exports.findNode = findNode;
Expand All @@ -171,14 +163,9 @@ var fullNodeData = function(path, callback, failCallback){
Node.findOne({name: pathParts.nodeName, path: pathParts.pathToNode}, function(err, node){
if(err){failCallback(err); }
else{
findNodeDataObject(
node,
function(data){
callback(data);
},
function(err){
failCallback(err);
}
findNodeDataObject(node,
function(data){ callback(data); },
function(err){ failCallback(err); }
);
}
});
Expand All @@ -191,17 +178,11 @@ var updateNode = function(path, tags, unique, data, callback, failCallback){
deleteNode(path,
function(){
insertNode(pathParts.nodeName, pathParts.pathToNode, tags, unique, data,
function(){
callback();
},
function(err){
failCallback(err);
}
function(){ callback(); },
function(err){ failCallback(err); }
);
},
function(err){
failCallback(err);
}
function(err){ failCallback(err); }
)
}
exports.updateNode = updateNode;

0 comments on commit 24df88d

Please sign in to comment.