Jump to 0.3.1

This commit is contained in:
Wu Cheng-Han
2015-07-02 00:10:20 +08:00
parent f7f8c901f4
commit 10c9811fc5
49 changed files with 2336 additions and 448 deletions

View File

@@ -6,6 +6,7 @@ var util = require('util');
//core
var config = require("../config.js");
var logger = require("./logger.js");
//public
var db = {
@@ -48,18 +49,18 @@ function newToDB(id, owner, body, callback) {
if (err) {
client.end();
callback(err, null);
return console.error('could not connect to postgres', err);
return logger.error('could not connect to postgres', err);
}
var newnotequery = util.format(insertquery, id, owner, body);
//console.log(newnotequery);
//logger.info(newnotequery);
client.query(newnotequery, function (err, result) {
client.end();
if (err) {
callback(err, null);
return console.error("new note to db failed: " + err);
return logger.error("new note to db failed: " + err);
} else {
if (config.debug)
console.log("new note to db success");
logger.info("new note to db success");
callback(null, result);
}
});
@@ -72,22 +73,22 @@ function readFromDB(id, callback) {
if (err) {
client.end();
callback(err, null);
return console.error('could not connect to postgres', err);
return logger.error('could not connect to postgres', err);
}
var readquery = util.format(selectquery, id);
//console.log(readquery);
//logger.info(readquery);
client.query(readquery, function (err, result) {
client.end();
if (err) {
callback(err, null);
return console.error("read from db failed: " + err);
return logger.error("read from db failed: " + err);
} else {
//console.log(result.rows);
//logger.info(result.rows);
if (result.rows.length <= 0) {
callback("not found note in db: " + id, null);
} else {
if(config.debug)
console.log("read from db success");
logger.info("read from db success");
callback(null, result);
}
}
@@ -101,18 +102,18 @@ function saveToDB(id, title, data, callback) {
if (err) {
client.end();
callback(err, null);
return console.error('could not connect to postgres', err);
return logger.error('could not connect to postgres', err);
}
var savequery = util.format(updatequery, title, data, id);
//console.log(savequery);
//logger.info(savequery);
client.query(savequery, function (err, result) {
client.end();
if (err) {
callback(err, null);
return console.error("save to db failed: " + err);
return logger.error("save to db failed: " + err);
} else {
if (config.debug)
console.log("save to db success");
logger.info("save to db success");
callback(null, result);
}
});
@@ -125,20 +126,20 @@ function countFromDB(callback) {
if (err) {
client.end();
callback(err, null);
return console.error('could not connect to postgres', err);
return logger.error('could not connect to postgres', err);
}
client.query(countquery, function (err, result) {
client.end();
if (err) {
callback(err, null);
return console.error("count from db failed: " + err);
return logger.error("count from db failed: " + err);
} else {
//console.log(result.rows);
//logger.info(result.rows);
if (result.rows.length <= 0) {
callback("not found note in db", null);
} else {
if(config.debug)
console.log("count from db success");
logger.info("count from db success");
callback(null, result);
}
}