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

- Include translator filename in error message on JSON parsing failure

Browse Source 
- Recategorize Zotero.log() errors so they show up as chrome errors in Console2
This commit is contained in:
Dan Stillman 2010-08-24 21:08:04 +00:00
parent f10da8c527
commit e0c8e30161
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
chrome/content/zotero/xpcom/translate.js
View File

@ -309,7 +309,7 @@ Zotero.Translator = function(file, json, code) {
// We assume lastUpdated is at the end to avoid running the regexp on more than necessary // We assume lastUpdated is at the end to avoid running the regexp on more than necessary
var lastUpdatedIndex = str.value.indexOf('"lastUpdated"'); var lastUpdatedIndex = str.value.indexOf('"lastUpdated"');
if (lastUpdatedIndex == -1) { if (lastUpdatedIndex == -1) {
this.logError("Invalid or missing translator metadata JSON object"); this.logError("Invalid or missing translator metadata JSON object in " + file.leafName);
fStream.close(); fStream.close();
return; return;
} }
@ -318,7 +318,7 @@ Zotero.Translator = function(file, json, code) {
var header = str.value.substr(0, lastUpdatedIndex + 50); var header = str.value.substr(0, lastUpdatedIndex + 50);
var m = infoRe.exec(header); var m = infoRe.exec(header);
if (!m) { if (!m) {
this.logError("Invalid or missing translator metadata JSON object"); this.logError("Invalid or missing translator metadata JSON object in " + file.leafName);
fStream.close(); fStream.close();
return; return;
} }
@ -328,7 +328,7 @@ Zotero.Translator = function(file, json, code) {
try { try {
var info = Zotero.JSON.unserialize(this.metadataString); var info = Zotero.JSON.unserialize(this.metadataString);
} catch(e) { } catch(e) {
this.logError("Invalid or missing translator metadata JSON object"); this.logError("Invalid or missing translator metadata JSON object in " + file.leafName);
fStream.close(); fStream.close();
return; return;
} }
@ -338,7 +338,7 @@ Zotero.Translator = function(file, json, code) {
// make sure we have all the properties // make sure we have all the properties
for each(var property in ["translatorID", "translatorType", "label", "creator", "target", "minVersion", "maxVersion", "priority", "lastUpdated", "inRepository"]) { for each(var property in ["translatorID", "translatorType", "label", "creator", "target", "minVersion", "maxVersion", "priority", "lastUpdated", "inRepository"]) {
if(info[property] === undefined) { if(info[property] === undefined) {
this.logError('Missing property "'+property+'" in translator metadata JSON object'); this.logError('Missing property "'+property+'" in translator metadata JSON object in ' + file.leafName);
haveMetadata = false; haveMetadata = false;
break; break;
} else { } else {

2
chrome/content/zotero/xpcom/zotero.js
View File

@ -697,7 +697,7 @@ var Zotero = new function(){
lineNumber != undefined ? lineNumber : null, lineNumber != undefined ? lineNumber : null,
columnNumber != undefined ? columnNumber : null, columnNumber != undefined ? columnNumber : null,
flags, flags,
'XUL javascript' // DEBUG: this doesn't seem to work 'component javascript'
); );
consoleService.logMessage(scriptError); consoleService.logMessage(scriptError);
} }