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

Fix error when upgrading from a database with an older version of a style with a different URI

Browse Source
This commit is contained in:
Dan Stillman 2009-02-06 01:27:12 +00:00
parent 942b732455
commit f307698ae3
1 changed files with 19 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
chrome/content/zotero/xpcom/schema.js
View File

@ -345,26 +345,31 @@ Zotero.Schema = new function(){
if (mode == 'translator') { if (mode == 'translator') {
var fileName = Zotero.File.getValidFileName(newObj[titleField]) + fileExt var fileName = Zotero.File.getValidFileName(newObj[titleField]) + fileExt
var destFile = destDir.clone();
destFile.append(fileName);
if (destFile.exists()) {
var msg = "Overwriting translator with same filename '"
+ fileName + "'";
Zotero.debug(msg, 1);
Components.utils.reportError(msg + " in Zotero.Schema.updateBundledFiles()");
destFile.remove(false);
}
} }
else if (mode == 'style') { else if (mode == 'style') {
var fileName = file.leafName; var fileName = file.leafName;
} }
if (!existingObj || !existingObj.hidden) { try {
file.copyTo(destDir, fileName); var destFile = destDir.clone();
destFile.append(fileName);
if (destFile.exists()) {
var msg = "Overwriting " + mode + " with same filename '"
+ fileName + "'";
Zotero.debug(msg, 1);
Components.utils.reportError(msg + " in Zotero.Schema.updateBundledFiles()");
destFile.remove(false);
}
if (!existingObj || !existingObj.hidden) {
file.copyTo(destDir, fileName);
}
else {
file.copyTo(hiddenDir, fileName);
}
} }
else { catch (e) {
file.copyTo(hiddenDir, fileName); Components.utils.reportError("Error copying file " + fileName + ": " + e);
} }
} }
} }