mirrors/etherpad-lite
1
0
Fork 0
mirror of https://github.com/ether/etherpad-lite.git synced 2025-05-04 22:27:10 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge 3bbb9f2ce7 into 9eac04aaa6

Browse source
This commit is contained in:
GitHub Merge Button 2011-11-13 20:58:20 -08:00
commit 32f81bbf5e
2 changed files with 28 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

24
bin/convert.js
View file

@ -155,9 +155,17 @@ function convertPad(padId, callback)
{ {
//parse the pages //parse the pages
for(var i=0,length=results.length;i<length;i++) for(var i=0,length=results.length;i<length;i++)
{
try
{ {
parsePage(chatMessages, results[i].PAGESTART, results[i].OFFSETS, results[i].DATA, true); parsePage(chatMessages, results[i].PAGESTART, results[i].OFFSETS, results[i].DATA, true);
} }
catch (xerr)
{
console.log("Could not parse PAD_CHAT_TEXT for padid:", padId);
throw(xerr);
}
}
} }
callback(err); callback(err);
@ -193,9 +201,17 @@ function convertPad(padId, callback)
{ {
//parse the pages //parse the pages
for(var i=0,length=results.length;i<length;i++) for(var i=0,length=results.length;i<length;i++)
{
try
{ {
parsePage(changesetsMeta, results[i].PAGESTART, results[i].OFFSETS, results[i].DATA, true); parsePage(changesetsMeta, results[i].PAGESTART, results[i].OFFSETS, results[i].DATA, true);
} }
catch (xerr)
{
console.log("Could not parse PAD_REVMETA_TEXT for padid:", padId);
throw(xerr);
}
}
} }
callback(err); callback(err);
@ -227,9 +243,17 @@ function convertPad(padId, callback)
{ {
//parse the pages //parse the pages
for(var i=0, length=results.length;i<length;i++) for(var i=0, length=results.length;i<length;i++)
{
try
{ {
parsePage(authors, results[i].PAGESTART, results[i].OFFSETS, results[i].DATA, true); parsePage(authors, results[i].PAGESTART, results[i].OFFSETS, results[i].DATA, true);
} }
catch (xerr)
{
console.log("Could not parse PAD_AUTHORS_TEXT for padid:", padId);
throw(xerr);
}
}
} }
callback(err); callback(err);

2
bin/convertSettings.json.template
View file

@ -1,5 +1,5 @@
{ {
"etherpad-db": "etherpadDB":
{ {
"host": "localhost", "host": "localhost",
"port": 3306, "port": 3306,