From fd73f252a03d3a48a53c2b712121e241f2c17b18 Mon Sep 17 00:00:00 2001
From: stefanp <helma@helma.org>
Date: Mon, 25 Mar 2002 17:58:19 +0000
Subject: [PATCH] bugfixed and improved calculation of 5-minute request count

---
 Root/macros.js | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/Root/macros.js b/Root/macros.js
index 535c81b7..3f5f3be5 100644
--- a/Root/macros.js
+++ b/Root/macros.js
@@ -26,7 +26,9 @@ function countSessions_macro(par)	{
 	var arr = this.getApplications();
 	var sum = 0;
 	for ( var i=0; i<arr.length; i++ )	{
-		sum += arr[i].sessions.size();
+		if ( arr[i].getName()!=app.__app__.getName() )	{
+			sum += arr[i].sessions.size();
+		}
 	}
 	return sum + formatCount(sum,par);
 }
@@ -37,11 +39,18 @@ function countSessions_macro(par)	{
   * @see global.formatCount
   */
 function countRequests_macro(par)	{
+	if ( app.requestStat==null )	{
+		return;
+	}
 	var arr = this.getApplications();
 	var sum = 0;
 	for ( var i=0; i<arr.length; i++ )	{
-		var obj = app.requestStat.get(arr[i].name);
-		sum += obj.last5Min;
+		if ( arr[i].getName()!=app.__app__.getName() )	{
+			var obj = app.requestStat.get(arr[i].name);
+			if ( obj!=null )	{
+				sum += obj.last5Min;
+			}
+		}
 	}
 	return sum + formatCount(sum,par);
 }