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

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

@ -345,20 +345,21 @@ 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
}
else if (mode == 'style') {
var fileName = file.leafName;
}
try {
var destFile = destDir.clone(); var destFile = destDir.clone();
destFile.append(fileName); destFile.append(fileName);
if (destFile.exists()) { if (destFile.exists()) {
var msg = "Overwriting translator with same filename '" var msg = "Overwriting " + mode + " with same filename '"
+ fileName + "'"; + fileName + "'";
Zotero.debug(msg, 1); Zotero.debug(msg, 1);
Components.utils.reportError(msg + " in Zotero.Schema.updateBundledFiles()"); Components.utils.reportError(msg + " in Zotero.Schema.updateBundledFiles()");
destFile.remove(false); destFile.remove(false);
} }
}
else if (mode == 'style') {
var fileName = file.leafName;
}
if (!existingObj || !existingObj.hidden) { if (!existingObj || !existingObj.hidden) {
file.copyTo(destDir, fileName); file.copyTo(destDir, fileName);
@ -367,6 +368,10 @@ Zotero.Schema = new function(){
file.copyTo(hiddenDir, fileName); file.copyTo(hiddenDir, fileName);
} }
} }
catch (e) {
Components.utils.reportError("Error copying file " + fileName + ": " + e);
}
}
} }
Zotero.DB.beginTransaction(); Zotero.DB.beginTransaction();