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

Fix a few potential attachment errors

Browse Source
This commit is contained in:
Dan Stillman 2008-06-26 04:14:02 +00:00
parent 1e42abb5e4
commit 91b2fb99f1
2 changed files with 27 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
chrome/content/zotero/xpcom/data/item.js
View File

@ -2166,6 +2166,7 @@ Zotero.Item.prototype.getFile = function(row, skipExistsCheck) {
} }
catch (e) { catch (e) {
Zotero.debug('Invalid persistent descriptor'); Zotero.debug('Invalid persistent descriptor');
return false;
} }
} }
} }
@ -2191,6 +2192,7 @@ Zotero.Item.prototype.getFile = function(row, skipExistsCheck) {
} }
catch (e) { catch (e) {
Zotero.debug('Invalid relative descriptor'); Zotero.debug('Invalid relative descriptor');
return false;
} }
} }
} }

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

@ -1569,6 +1569,22 @@ Zotero.Schema = new function(){
continue; continue;
} }
if (keys[id]) { if (keys[id]) {
var renameTarget = storage37.clone();
renameTarget.append(keys[id]);
if (renameTarget.exists()) {
if (!orphaned.exists()) {
orphaned.create(Components.interfaces.nsIFile.DIRECTORY_TYPE, 0755);
}
var target = orphaned.clone();
target.append(keys[id]);
var newName = null;
if (target.exists()) {
target.createUnique(Components.interfaces.nsIFile.NORMAL_FILE_TYPE, 0644);
newName = target.leafName;
target.remove(null);
}
renameTarget.moveTo(orphaned, newName);
}
file.moveTo(null, keys[id]); file.moveTo(null, keys[id]);
moveReport += keys[id] + ' ' + id + "\n"; moveReport += keys[id] + ' ' + id + "\n";
} }
@ -1576,7 +1592,15 @@ Zotero.Schema = new function(){
if (!orphaned.exists()) { if (!orphaned.exists()) {
orphaned.create(Components.interfaces.nsIFile.DIRECTORY_TYPE, 0755); orphaned.create(Components.interfaces.nsIFile.DIRECTORY_TYPE, 0755);
} }
file.moveTo(orphaned, null); var target = orphaned.clone();
target.append(file.leafName);
var newName = null;
if (target.exists()) {
target.createUnique(Components.interfaces.nsIFile.NORMAL_FILE_TYPE, 0644);
newName = target.leafName;
target.remove(null);
}
file.moveTo(orphaned, newName);
} }
movedFiles37[id] = file; movedFiles37[id] = file;
} }