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

[WebPageDump] More verbose log messages

Browse Source 
Log full error stack
This commit is contained in:
Aurimas Vinckevicius 2015-02-21 20:32:45 -06:00
parent 3089685b33
commit 66eb40da32
2 changed files with 21 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -310,8 +310,10 @@ var wpdCommon = {
}, },
// add a line to the error list (displays a maximum of 15 errors) // add a line to the error list (displays a maximum of 15 errors)
addError: function (aError) { addError: function (errorMsg, errorObj) {
Zotero.debug('ERROR: ' + aError); if (errorMsg) Zotero.debug(errorMsg);
if (errorObj) Zotero.debug(errorObj);
/*
if (this.errCount < WPD_MAXUIERRORCOUNT) { if (this.errCount < WPD_MAXUIERRORCOUNT) {
if (this.errList.indexOf(aError) > -1) return; // is the same if (this.errList.indexOf(aError) > -1) return; // is the same
this.errList = this.errList + aError + "\n"; this.errList = this.errList + aError + "\n";
@ -319,6 +321,7 @@ var wpdCommon = {
this.errList = this.errList + '...'; this.errList = this.errList + '...';
} }
this.errCount++; this.errCount++;
*/
}, },
saveWebPage: function (aDestFile) { saveWebPage: function (aDestFile) {
@ -505,7 +508,7 @@ var wpdCommon = {
var aBaseURLObj = this.convertURLToObject(aBaseURL); var aBaseURLObj = this.convertURLToObject(aBaseURL);
return aBaseURLObj.resolve(aRelURL); return aBaseURLObj.resolve(aRelURL);
} catch (ex) { } catch (ex) {
this.addError("[wpdCommon.resolveURL]:\n -> aBaseURL: " + aBaseURL + "\n -> aRelURL: " + aRelURL + "\n -> " + ex); this.addError("[wpdCommon.resolveURL]:\n -> aBaseURL: " + aBaseURL + "\n -> aRelURL: " + aRelURL, ex);
} }
return ""; return "";
}, },
@ -516,7 +519,7 @@ var wpdCommon = {
aURLObj.spec = aURL aURLObj.spec = aURL
return aURLObj.asciiHost; return aURLObj.asciiHost;
} catch (ex) { } catch (ex) {
this.addError("[wpdCommon.getHostName]:\n -> aURL: " + aURL + "\n -> " + ex); this.addError("[wpdCommon.getHostName]:\n -> aURL: " + aURL, ex);
} }
return ""; return "";
}, },
@ -527,7 +530,7 @@ var wpdCommon = {
aURLObj.spec = aURL aURLObj.spec = aURL
return aURLObj.asciiSpec; return aURLObj.asciiSpec;
} catch (ex) { } catch (ex) {
this.addError("[wpdCommon.getHostName]:\n -> aURL: " + aURL + "\n -> " + ex); this.addError("[wpdCommon.getHostName]:\n -> aURL: " + aURL, ex);
} }
return ""; return "";
}, },
@ -577,7 +580,7 @@ var wpdCommon = {
if (text) output = output.split(/\n/g); if (text) output = output.split(/\n/g);
return output; return output;
} catch (ex) { } catch (ex) {
this.addError("[wpdCommon.readFile]:\n -> str_Filename: " + str_Filename + "\n -> " + ex); this.addError("[wpdCommon.readFile]:\n -> str_Filename: " + str_Filename, ex);
} }
return ""; return "";
}, },
@ -621,7 +624,7 @@ var wpdCommon = {
obj_Transport.close(); obj_Transport.close();
return true; return true;
} catch (ex) { } catch (ex) {
this.addError("[wpdCommon.writeFile]:\n -> str_Filename: " + str_Filename + "\n -> " + ex); this.addError("[wpdCommon.writeFile]:\n -> str_Filename: " + str_Filename, ex);
} }
return false; return false;
}, },
@ -678,7 +681,7 @@ var wpdCommon = {
} catch (ex) { } catch (ex) {
aSourceURL = this.removeGETFromURL(aSourceURL); aSourceURL = this.removeGETFromURL(aSourceURL);
this.addError("[wpdCommon.downloadFile]:\n -> aSourceURL: " + aSourceURL.substring(aSourceURL.length - 60) + "\n -> aTargetFilename: " + aTargetFilename + "\n -> " + ex); this.addError("[wpdCommon.downloadFile]:\n -> aSourceURL: " + aSourceURL.substring(aSourceURL.length - 60) + "\n -> aTargetFilename: " + aTargetFilename, ex);
} }
return false; return false;
}, },

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

@ -503,7 +503,7 @@ var wpdDOMSaver = {
aNode.setAttribute("src", this.relativeLinkFix(newFileName)); aNode.setAttribute("src", this.relativeLinkFix(newFileName));
} }
} catch (ex) { } catch (ex) {
wpdCommon.addError("[wpdCommon.processDOMNode]:\n -> aNode.nodeName: " + aNode.nodeName + "\n -> " + ex); wpdCommon.addError("[wpdCommon.processDOMNode]:\n -> aNode.nodeName: " + aNode.nodeName, ex);
} }
break; break;
case "xmp": case "xmp":
@ -525,7 +525,7 @@ var wpdDOMSaver = {
aNode.removeAttribute("onload"); aNode.removeAttribute("onload");
} }
} catch (ex) { } catch (ex) {
wpdCommon.addError("[wpdDOMSaver.processDOMNode]:\n -> aNode.nodeName: " + aNode.nodeName + "\n -> " + ex); wpdCommon.addError("[wpdDOMSaver.processDOMNode]:\n -> aNode.nodeName: " + aNode.nodeName, ex);
} }
return aNode; return aNode;
}, },
@ -750,7 +750,7 @@ var wpdDOMSaver = {
} }
return newFileName; return newFileName;
} catch (ex) { } catch (ex) {
wpdCommon.addError("[wpdDOMSaver.download]\n -> aURLSpec: " + aURLSpec + "\n -> " + ex); wpdCommon.addError("[wpdDOMSaver.download]\n -> aURLSpec: " + aURLSpec, ex);
return ""; return "";
} }
}, },
@ -784,7 +784,7 @@ var wpdDOMSaver = {
rootNode.insertBefore(aDocument.createTextNode("\n"), rootNode.firstChild); rootNode.insertBefore(aDocument.createTextNode("\n"), rootNode.firstChild);
} catch (ex) { } catch (ex) {
wpdCommon.addError("[wpdDOMSaver.createDocTypeNode]\n -> " + ex); wpdCommon.addError("[wpdDOMSaver.createDocTypeNode]", ex);
} }
}, },
@ -795,7 +795,7 @@ var wpdDOMSaver = {
try { try {
return aHTMLText.replace("<wpd_doctype></wpd_doctype>", this.getDocType(aDocument)); return aHTMLText.replace("<wpd_doctype></wpd_doctype>", this.getDocType(aDocument));
} catch (ex) { } catch (ex) {
wpdCommon.addError("[wpdDOMSaver.replaceDocType]\n -> " + ex); wpdCommon.addError("[wpdDOMSaver.replaceDocType]", ex);
} }
return aHTMLText; return aHTMLText;
}, },
@ -857,7 +857,7 @@ var wpdDOMSaver = {
rootNode.firstChild.insertBefore(aDocument.createTextNode("\n"), rootNode.firstChild.firstChild); rootNode.firstChild.insertBefore(aDocument.createTextNode("\n"), rootNode.firstChild.firstChild);
} catch (ex) { } catch (ex) {
wpdCommon.addError("[wpdDOMSaver.createMetaCharsetNode]\n -> " + ex); wpdCommon.addError("[wpdDOMSaver.createMetaCharsetNode]", ex);
} }
}, },
@ -872,7 +872,7 @@ var wpdDOMSaver = {
rootNode.firstChild.insertBefore(aDocument.createTextNode("\n"), rootNode.firstChild.firstChild); rootNode.firstChild.insertBefore(aDocument.createTextNode("\n"), rootNode.firstChild.firstChild);
rootNode.firstChild.insertBefore(metaNode, rootNode.firstChild.firstChild); rootNode.firstChild.insertBefore(metaNode, rootNode.firstChild.firstChild);
} catch (ex) { } catch (ex) {
wpdCommon.addError("[wpdDOMSaver.createMetaNameNode]\n -> " + ex); wpdCommon.addError("[wpdDOMSaver.createMetaNameNode]", ex);
} }
}, },
@ -981,7 +981,7 @@ var wpdDOMSaver = {
Zotero.debug("[wpdDOMSaver.saveDocumentCSS]: " + this.currentDir + aFileName); Zotero.debug("[wpdDOMSaver.saveDocumentCSS]: " + this.currentDir + aFileName);
// write css file // write css file
var CSSFile = this.currentDir + aFileName; var CSSFile = this.currentDir + aFileName;
if (!wpdCommon.writeFile(CSSText, CSSFile)) wpdCommon.addError("[wpdDOMSaver.saveDocumentCSS]: could not write CSS File\n"); if (!wpdCommon.writeFile(CSSText, CSSFile)) wpdCommon.addError("[wpdDOMSaver.saveDocumentCSS]: could not write CSS File");
return aFileName; return aFileName;
} }
} }
@ -1051,7 +1051,7 @@ var wpdDOMSaver = {
// and write the file... // and write the file...
var HTMLFile = this.currentDir + aFileName; var HTMLFile = this.currentDir + aFileName;
if (!wpdCommon.writeFile(HTMLText, HTMLFile)) wpdCommon.addError("[wpdDOMSaver.saveDocumentHTML]: could not write HTML File\n"); if (!wpdCommon.writeFile(HTMLText, HTMLFile)) wpdCommon.addError("[wpdDOMSaver.saveDocumentHTML]: could not write HTML File");
return aFileName; return aFileName;
}, },
@ -1083,7 +1083,7 @@ var wpdDOMSaver = {
try { try {
return this.saveDocumentEx(this.document, this.name); return this.saveDocumentEx(this.document, this.name);
} catch (ex) { } catch (ex) {
wpdCommon.addError("[wpdDOMSaver.saveHTMLDocument]\n -> " + ex); wpdCommon.addError("[wpdDOMSaver.saveHTMLDocument]", ex);
} }
} }