mirrors/zotero
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Handle pathological case with backslashes in path

Browse source
This commit is contained in:
Simon Kornblith 2013-04-18 02:52:36 -04:00
parent 61300e4dd7
commit 6fe1c1cbba
1 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
chrome/content/zotero/xpcom/translation/translate_item.js
View file

@ -314,11 +314,10 @@ Zotero.Translate.ItemSaver.prototype = {
"_parseRelativePath":function(path) { "_parseRelativePath":function(path) {
try { try {
var file = this._baseURI.QueryInterface(Components.interfaces.nsIFileURL).file.parent; var file = this._baseURI.QueryInterface(Components.interfaces.nsIFileURL).file.parent;
var splitPath = path.split(/[\/\\]/g); var splitPath = path.split(/\//g);
for(var i=0; i<splitPath.length; i++) { for(var i=0; i<splitPath.length; i++) {
if(splitPath[i] !== "") file.append(splitPath[i]); if(splitPath[i] !== "") file.append(splitPath[i]);
} }
Zotero.debug("Testing "+file.path);
if(file.exists()) return file; if(file.exists()) return file;
} catch(e) { } catch(e) {
Zotero.logError(e); Zotero.logError(e);
@ -343,7 +342,13 @@ Zotero.Translate.ItemSaver.prototype = {
} else if(path.substr(0, 7) !== "file://") { } else if(path.substr(0, 7) !== "file://") {
// If it was a fully qualified file URI, we can give up now // If it was a fully qualified file URI, we can give up now
// Next, try to parse as relative path // Next, try to parse as relative path, replacing backslashes with slashes
if((file = this._parseRelativePath(path.replace(/\\/g, "/")))) {
Zotero.debug("Translate: Got file "+path+" as relative path");
return file;
}
// Next, try to parse as relative path, without replacing backslashes with slashes
if((file = this._parseRelativePath(path))) { if((file = this._parseRelativePath(path))) {
Zotero.debug("Translate: Got file "+path+" as relative path"); Zotero.debug("Translate: Got file "+path+" as relative path");
return file; return file;