www

commit 32bfb0e40705b2b061383d8680b436c803e9ea88
parent 067e5ce5b49ab5d19def7cf7a3c306547f716678
Author: Simon Kornblith <simon@simonster.com>
Date:   Sat,  3 Nov 2012 17:48:03 -0700

Merge pull request #186 from aurimasv/attach

Fix searching for non-existing attachments with relative paths
Diffstat:
M
chrome/content/zotero/xpcom/translation/translate_item.js
 | 
10
++++++----

1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/chrome/content/zotero/xpcom/translation/translate_item.js b/chrome/content/zotero/xpcom/translation/translate_item.js
@@ -239,7 +239,7 @@ Zotero.Translate.ItemSaver.prototype = {
 			var newItem = Zotero.Items.get(myID);
 		} else {
 			var file = this._parsePath(attachment.path);
-			if(!file || !file.exists()) return;
+			if(!file) return;
 			
 			if (attachment.url) {
 				var myID = Zotero.Attachments.importSnapshotFromFile(file,
@@ -297,13 +297,15 @@ Zotero.Translate.ItemSaver.prototype = {
 			return false;
 		}
 		
-		if(!file.exists() && path[0] !== "/" && path.substr(0, 5).toLowerCase() !== "file:") {
+		if(file.exists()) {
+			return file;
+		} else if(path[0] !== "/" && path.substr(0, 5).toLowerCase() !== "file:") {
 			// This looks like a relative path, but it might actually be an absolute path, because
 			// some people are not quite there.
 			var newFile = this._parsePath("/"+path);
-			if(newFile.exists()) return newFile;
+			if(newFile && newFile.exists()) return newFile;
 		}
-		return file;
+		return false;
 	},
 	
 	"_saveAttachmentDownload":function(attachment, parentID) {