From af25606ea88704a8f81d10202fe84f613a60de30 Mon Sep 17 00:00:00 2001
From: Marcel Klehr <mklehr@gmx.net>
Date: Wed, 27 Feb 2013 16:26:22 +0100
Subject: [PATCH] Fix bin/extractPadData on windows

---
 bin/extractPadData.js | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/bin/extractPadData.js b/bin/extractPadData.js
index 0d1acaaee..e3678c4e0 100644
--- a/bin/extractPadData.js
+++ b/bin/extractPadData.js
@@ -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
         }