suzanne.soy/zotero
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove DB corruption marker after wiping DB

Browse Source
This commit is contained in:
Dan Stillman 2007-08-15 20:19:11 +00:00
parent 2819eba236
commit a64c4f8e15
1 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
chrome/content/zotero/xpcom/db.js
View File

@ -573,6 +573,7 @@ Zotero.DBConnection.prototype.integrityCheck = function () {
Zotero.DBConnection.prototype.checkException = function (e) { Zotero.DBConnection.prototype.checkException = function (e) {
if (e.name && e.name == 'NS_ERROR_FILE_CORRUPTED') { if (e.name && e.name == 'NS_ERROR_FILE_CORRUPTED') {
// Write corrupt marker to data directory
var file = Zotero.getZoteroDatabase(this._dbName, 'is.corrupt'); var file = Zotero.getZoteroDatabase(this._dbName, 'is.corrupt');
var foStream = Components.classes["@mozilla.org/network/file-output-stream;1"] var foStream = Components.classes["@mozilla.org/network/file-output-stream;1"]
.createInstance(Components.interfaces.nsIFileOutputStream); .createInstance(Components.interfaces.nsIFileOutputStream);
@ -805,6 +806,10 @@ Zotero.DBConnection.prototype._getDBConnection = function () {
var file = Zotero.getZoteroDatabase(this._dbName); var file = Zotero.getZoteroDatabase(this._dbName);
this._connection = store.openDatabase(file); this._connection = store.openDatabase(file);
if (corruptMarker.exists()) {
corruptMarker.remove(null);
}
alert(Zotero.getString('db.dbCorruptedNoBackup', fileName)); alert(Zotero.getString('db.dbCorruptedNoBackup', fileName));
break catchBlock; break catchBlock;
} }
@ -825,6 +830,11 @@ Zotero.DBConnection.prototype._getDBConnection = function () {
this._connection = store.openDatabase(file); this._connection = store.openDatabase(file);
alert(Zotero.getString('db.dbRestoreFailed', fileName)); alert(Zotero.getString('db.dbRestoreFailed', fileName));
if (corruptMarker.exists()) {
corruptMarker.remove(null);
}
break catchBlock; break catchBlock;
} }