www

commit 8be83cedec1d1b9df63b2a1abdb4a0afb1ef69dc
parent 6de3fa4d47749d3a46eb46d1541a725f7ae15ae8
Author: Aurimas Vinckevicius <aurimas.dev@gmail.com>
Date:   Mon, 19 Jan 2015 15:13:49 -0600

Allow file paths to be specified in attachment.url
In translators, it may not always be clear whether the given URI is a URL or a local file path.
Regression from 849803473a0386aacc86745466d56f0ff3463f48 (that piece of code was introduced by me)
Re https://forums.zotero.org/discussion/45710/ris-import-from-endnote-mac-yosemite-to-zotero-standalone/

Diffstat:
M
chrome/content/zotero/xpcom/translation/translate_item.js
 | 
41
+++++++++++++++++++++++------------------

1 file changed, 23 insertions(+), 18 deletions(-)
diff --git a/chrome/content/zotero/xpcom/translation/translate_item.js b/chrome/content/zotero/xpcom/translation/translate_item.js
@@ -229,25 +229,25 @@ Zotero.Translate.ItemSaver.prototype = {
 		if(!attachment.path) {
 			let url = Zotero.Attachments.cleanAttachmentURI(attachment.url);
 			if (!url) {
-				let e = "Translate: Invalid attachment URL specified <" + attachment.url + ">";
-				Zotero.debug(e, 2);
-				attachmentCallback(attachment, false, e);
-				return false;
-			}
-			attachment.url = url;
-			url = Components.classes["@mozilla.org/network/io-service;1"]
-				.getService(Components.interfaces.nsIIOService)
-				.newURI(url, null, null); // This cannot fail, since we check above
-			
-			// see if this is actually a file URL
-			if(url.scheme == "file") {
+				Zotero.debug("Translate: Invalid attachment.url specified <" + attachment.url + "> Will attempt to treat it as path.");
 				attachment.path = attachment.url;
 				attachment.url = false;
-			} else if(url.scheme != "http" && url.scheme != "https") {
-				let e = "Translate: " + url.scheme + " protocol is not allowed for attachments from translators.";
-				Zotero.debug(e, 2);
-				attachmentCallback(attachment, false, e);
-				return false;
+			} else {
+				attachment.url = url;
+				url = Components.classes["@mozilla.org/network/io-service;1"]
+					.getService(Components.interfaces.nsIIOService)
+					.newURI(url, null, null); // This cannot fail, since we check above
+				
+				// see if this is actually a file URL
+				if(url.scheme == "file") {
+					attachment.path = attachment.url;
+					attachment.url = false;
+				} else if(url.scheme != "http" && url.scheme != "https") {
+					let e = "Translate: " + url.scheme + " protocol is not allowed for attachments from translators.";
+					Zotero.debug(e, 2);
+					attachmentCallback(attachment, false, e);
+					return false;
+				}
 			}
 		}
 		
@@ -268,7 +268,12 @@ Zotero.Translate.ItemSaver.prototype = {
 			var newItem = Zotero.Items.get(myID);
 		} else {
 			var file = this._parsePath(attachment.path);
-			if(!file) return;
+			if(!file) {
+				let e = "Translate: Could not parse attachment path <" + attachment.path + ">";
+				Zotero.debug(e, 2);
+				attachmentCallback(attachment, false, e);
+				return false;
+			}
 			
 			if (attachment.url) {
 				attachment.linkMode = "imported_url";