www

commit f307698ae3cec1b420a52691dce10f72cbf83e57
parent 942b732455138e17f8bc164ce005f3106fedc865
Author: Dan Stillman <dstillman@zotero.org>
Date:   Fri,  6 Feb 2009 01:27:12 +0000

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


Diffstat:
M
chrome/content/zotero/xpcom/schema.js
 | 
27
++++++++++++++++-----------

1 file changed, 16 insertions(+), 11 deletions(-)
diff --git a/chrome/content/zotero/xpcom/schema.js b/chrome/content/zotero/xpcom/schema.js
@@ -345,26 +345,31 @@ Zotero.Schema = new function(){
 				
 				if (mode == 'translator') {
 					var fileName = Zotero.File.getValidFileName(newObj[titleField]) + fileExt
-					
+				}
+				else if (mode == 'style') {
+					var fileName = file.leafName;
+				}
+				
+				try {
 					var destFile = destDir.clone();
 					destFile.append(fileName);
 					if (destFile.exists()) {
-						var msg = "Overwriting translator with same filename '"
+						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 if (mode == 'style') {
-					var fileName = file.leafName;
-				}
-				
-				if (!existingObj || !existingObj.hidden) {
-					file.copyTo(destDir, fileName);
-				}
-				else {
-					file.copyTo(hiddenDir, fileName);
+				catch (e) {
+					Components.utils.reportError("Error copying file " + fileName + ": " + e);
 				}
 			}
 		}