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

Fix web page dump when pages contain images/objects with same name as the web page.

Browse Source
This commit is contained in:
aurimasv 2012-11-08 16:49:13 -06:00
parent 2353e73bf2
commit f5d759b336
2 changed files with 32 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
chrome/content/zotero/webpagedump/common.js
View File

@ -630,7 +630,7 @@ var wpdCommon = {
// write the String Buffer (str_Buffer) to a file (str_Filename)
writeFile : function(str_Buffer,str_Filename)
{
{
if (MODE_SIMULATE) return true;
try{
var obj_File = Components.classes["@mozilla.org/file/local;1"].createInstance(Components.interfaces.nsILocalFile);
@ -699,7 +699,7 @@ var wpdCommon = {
// download aSourceURL to aTargetFilename
// (works also on local files...)
downloadFile : function (aSourceURL,aTargetFilename)
{
{
if (MODE_SIMULATE) return true;
try {
//new obj_URI object

52
chrome/content/zotero/webpagedump/domsaver.js
View File

@ -673,7 +673,15 @@ var wpdDOMSaver = {
}
return content;
},
//register filename, so we don't overwrite them later
registerFile : function(newFileName, sourceURL, content) {
this.fileInfo[newFileName] = {
url: sourceURL,
downloaded: content
}
},
// is the file registered (e.g. downloaded)?
isFileRegistered : function(newFileName)
{
@ -722,17 +730,16 @@ var wpdDOMSaver = {
var newFileName = aURL.fileName.toLowerCase();
if ( !newFileName ) newFileName = "untitled";
newFileName = wpdCommon.getValidFileName(newFileName);
// same name but different location?
// same name but different location?
newFileName = this.checkForEqualFilenames(newFileName,aURLSpec);
// is the file already registered (processed) ?
if ( this.isFileRegistered(newFileName)==false ) {
// No -> we have to download and register the file
this.fileInfo[newFileName] = new Array("url","downloaded");
this.fileInfo[newFileName]["url"] = aURLSpec;
this.fileInfo[newFileName]["downloaded"] = true;
if (aDownload)
this.fileInfo[newFileName]["downloaded"] = wpdCommon.downloadFile(aURLSpec,this.currentDir+newFileName);
if (aDownload) {
aDownload = wpdCommon.downloadFile(aURLSpec,this.currentDir+newFileName);
} else {
aDownload = true;
}
this.registerFile(newFileName, aURLSpec, aDownload);
}
return newFileName;
} catch(ex) {
@ -990,27 +997,29 @@ var wpdDOMSaver = {
// (".html" will be added)
saveDocumentHTML: function(aDocument,aFileName)
{
Zotero.debug("[wpdDOMSaver.saveDocumentHTML]: "+this.currentDir+aFileName+".html");
Zotero.debug("[wpdDOMSaver.saveDocumentHTML]: "+this.currentDir+aFileName+".html");
//register as a downloaded file, so other downloads don't overwrite it
this.registerFile(aFileName + ".html", aDocument.location.href, true);
this.curDocument = aDocument;
this.curCharacterSet = aDocument.characterSet;
var charset=this.curCharacterSet;
// we get the html node without childs and add the head and body trees
// manually so we are sure that we have a correct html file
var rootNode = aDocument.getElementsByTagName("html")[0].cloneNode(false);
var rootNode = aDocument.getElementsByTagName("html")[0].cloneNode(false);
try {
var headNode = aDocument.getElementsByTagName("head")[0].cloneNode(true);
rootNode.appendChild(headNode);
rootNode.appendChild(aDocument.createTextNode("\n"));
} catch(ex) { }
try {
this.curBody=aDocument.body.cloneNode(true);
} catch(ex) {
try {
var headNode = aDocument.getElementsByTagName("head")[0].cloneNode(true);
rootNode.appendChild(headNode);
rootNode.appendChild(aDocument.createTextNode("\n"));
} catch(ex) { }
try {
this.curBody=aDocument.body.cloneNode(true);
} catch(ex) {
this.curBody=aDocument.getElementsByTagName("body")[0].cloneNode(true);
}
rootNode.appendChild(this.curBody);
rootNode.appendChild(aDocument.createTextNode("\n"));
rootNode.appendChild(aDocument.createTextNode("\n"));
// now the processing of the dom nodes (changing hrefs, downloading...)
this.processDOMRecursively(rootNode);
@ -1034,7 +1043,6 @@ var wpdDOMSaver = {
// "var " added by Dan S. for Zotero
var HTMLText = this.generateHTMLString(aDocument,rootNode);
// convert the DOM String to the desired Charset
if (this.option["encodeUTF8"]) {
HTMLText = wpdCommon.ConvertFromUnicode16(HTMLText,"UTF-8");