www

commit e0c8e30161395a4530d6136bc78fdbac2cbd116d
parent f10da8c5270d3eb46f95b41de062e9764012a859
Author: Dan Stillman <dstillman@zotero.org>
Date:   Tue, 24 Aug 2010 21:08:04 +0000

- Include translator filename in error message on JSON parsing failure
- Recategorize Zotero.log() errors so they show up as chrome errors in Console2


Diffstat:
M
chrome/content/zotero/xpcom/translate.js
 | 
8
++++----
M
chrome/content/zotero/xpcom/zotero.js
 | 
2
+-

2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/chrome/content/zotero/xpcom/translate.js b/chrome/content/zotero/xpcom/translate.js
@@ -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
 		var lastUpdatedIndex = str.value.indexOf('"lastUpdated"');
 		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();
 			return;
 		}
@@ -318,7 +318,7 @@ Zotero.Translator = function(file, json, code) {
 		var header = str.value.substr(0, lastUpdatedIndex + 50);
 		var m = infoRe.exec(header);
 		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();
 			return;
 		}
@@ -328,7 +328,7 @@ Zotero.Translator = function(file, json, code) {
 		try {
 			var info = Zotero.JSON.unserialize(this.metadataString);
 		} 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();
 			return;
 		}
@@ -338,7 +338,7 @@ Zotero.Translator = function(file, json, code) {
 	// make sure we have all the properties
 	for each(var property in ["translatorID", "translatorType", "label", "creator", "target", "minVersion", "maxVersion", "priority", "lastUpdated", "inRepository"]) {
 		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;
 			break;
 		} else {
diff --git a/chrome/content/zotero/xpcom/zotero.js b/chrome/content/zotero/xpcom/zotero.js
@@ -697,7 +697,7 @@ var Zotero = new function(){
 			lineNumber != undefined ? lineNumber : null, 
 			columnNumber != undefined ? columnNumber : null,
 			flags,
-			'XUL javascript' // DEBUG: this doesn't seem to work
+			'component javascript'
 		);
 		consoleService.logMessage(scriptError);
 	}