fuwafuwa
/
etherpad-lite
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #1564 from marcelklehr/fix/extract-pad 

Fix bin/extractPadData on windows
This commit is contained in:
John McLear 2013-02-27 07:44:56 -08:00
parent 08ffdac409 af25606ea8
commit 3986835f58
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
bin/extractPadData.js
View File

@ -13,8 +13,8 @@ var padId = process.argv[2];
var db, dirty, padManager, pad, settings;
var neededDBValues = ["pad:"+padId];
var npm = require("../src/node_modules/npm");
var async = require("../src/node_modules/async");
var npm = require("../node_modules/ep_etherpad-lite/node_modules/npm");
var async = require("../node_modules/ep_etherpad-lite/node_modules/async");
async.series([
// load npm
@ -33,8 +33,8 @@ async.series([
},
// load modules
function(callback) {
settings = require('../src/node/utils/Settings');
db = require('../src/node/db/DB');
settings = require('../node_modules/ep_etherpad-lite/node/utils/Settings');
db = require('../node_modules/ep_etherpad-lite/node/db/DB');
dirty = require("../node_modules/ep_etherpad-lite/node_modules/ueberDB/node_modules/dirty")(padId + ".db");
callback();
},
@ -46,7 +46,7 @@ async.series([
//get the pad
function (callback)
{
padManager = require('../src/node/db/PadManager');
padManager = require('../node_modules/ep_etherpad-lite/node/db/PadManager');
padManager.getPad(padId, function(err, _pad)
{
@ -84,7 +84,7 @@ async.series([
{
if(err) { callback(err); return}
if(typeof dbvalue != 'object'){
if(dbvalue && typeof dbvalue != 'object'){
dbvalue=JSON.parse(dbvalue); // if its not json then parse it as json
}