[Nagvis-checkins] SF.net Git: nagvis: Fixed small js logging issues

[lars <la...@us...>]

Module: nagvis
Branch: master
Commit: 4403ba5d032a73ba73f786ea0a4047f773baf329
URL:    http://nagvis.git.sourceforge.net/git/gitweb.cgi?p=nagvis/nagvis;a=commit;h=4403ba5d032a73ba73f786ea0a4047f773baf329

Author: Lars Michelsen <lm...@la...>
Date:   Tue Aug  3 01:14:07 2010 +0200

Fixed small js logging issues

---

 share/frontend/nagvis-js/js/frontendContext.js  |    2 +-
 share/frontend/nagvis-js/js/frontendEventlog.js |   18 ++++++++++++------
 2 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/share/frontend/nagvis-js/js/frontendContext.js b/share/frontend/nagvis-js/js/frontendContext.js
index 2015f85..080c4e7 100644
--- a/share/frontend/nagvis-js/js/frontendContext.js
+++ b/share/frontend/nagvis-js/js/frontendContext.js
@@ -152,7 +152,7 @@ function contextShow(event) {
 
 		// Maybe there is no context menu defined for one object?
 		if(contextMenu === null) {
-			eventlog("context", "error", "Found no context menu wit the id \""+id+"-context\"");
+			eventlog('context', 'error', 'Found no context menu wit the id "'+id+'-context"');
 			
 			_replaceContext = false;
 			return false;
diff --git a/share/frontend/nagvis-js/js/frontendEventlog.js b/share/frontend/nagvis-js/js/frontendEventlog.js
index c564fbd..d3f6237 100644
--- a/share/frontend/nagvis-js/js/frontendEventlog.js
+++ b/share/frontend/nagvis-js/js/frontendEventlog.js
@@ -25,12 +25,13 @@
  * @author	Lars Michelsen <la...@ve...>
  */
 
-var oSeverity = {};
-oSeverity.debug = 4;
-oSeverity.info = 3;
-oSeverity.warning = 2;
-oSeverity.critical = 1;
-
+var oSeverity = {
+	'debug':    4,
+	'info':     3,
+	'warning':  2,
+	'critical': 1,
+	'error':    1,
+};
 
 function eventlogToggle() {
 	var oLog = document.getElementById('eventlog');
@@ -113,6 +114,11 @@ function eventlog(sComponent, sSeverity, sText) {
 			eventlog("eventlog", "info", "Eventlog initialized (Level: "+oPageProperties.event_log_level+")");
 			oEventlog = document.getElementById('eventlog');
 		}
+
+		if(typeof oSeverity[sSeverity] === 'undefined') {
+			eventlog('eventlog', 'error', 'Unknown severity used, skipping: '+sSeverity+' '+sComponent+': '+sText)
+			oEventlog = null;
+		}
 		
 		if(oSeverity[sSeverity] <= oSeverity[oPageProperties.event_log_level]) {
 			// When the message limit is reached truncate the first log entry