From: Evan Hunt <each@isc.org>
Date: Thu, 28 Feb 2013 17:58:13 +0000 (-0800)
Subject: [master] fix XSL glitch with empty query data
X-Git-Tag: v9.10.0a1~458
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=2b8dac99166f74532264f756f5c0b43a6b04d995;p=thirdparty%2Fbind9.git

[master] fix XSL glitch with empty query data

3507.	[bug]		Statistics channel XSL had a glitch when attempting
			to chart query data before any queries had been
			received. [RT #32620]
---

diff --git a/CHANGES b/CHANGES
index 27169665dd9..fcae54e4753 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,7 @@
+3507.	[bug]		Statistics channel XSL had a glitch when attempting
+			to chart query data before any queries had been
+			received. [RT #32620]
+
 3506.	[func]		When setting "max-cache-size" and "max-acache-size",
 			the keyword "unlimited" is no longer defined as equal
 			to 4 gigabytes (except on 32-bit platforms); it
diff --git a/bin/named/bind9.xsl b/bin/named/bind9.xsl
index 3b9016286fe..acba3e4f256 100644
--- a/bin/named/bind9.xsl
+++ b/bin/named/bind9.xsl
@@ -50,10 +50,11 @@
             
           // Server Incoming query Types
           while(g = graphs.shift()){
-           // alert("going for: " + g.target);
-            drawChart(g.title,g.target,g.data);
+            // alert("going for: " + g.target);
+            if(g.data.length > 1){
+              drawChart(g.title,g.target,g.data);
+            }
           }
-            
         }
         
             // Server Incoming Queries Types         
@@ -207,7 +208,7 @@
         <h2>Incoming Requests</h2>
         <xsl:if test="system-property('xsl:vendor')!='Transformiix'">
           <!-- Non Mozilla specific markup -->
-          <div class="pie" id="chart_incoming_requests">[graph incoming requests]</div>
+          <div class="pie" id="chart_incoming_requests">[graph of incoming requests]</div>
         </xsl:if>
         <table class="counters">
           <xsl:for-each select="server/counters[@type=&quot;opcode&quot;]/counter">
@@ -232,7 +233,7 @@
         <h3>Incoming Queries by Type</h3>
         <xsl:if test="system-property('xsl:vendor')!='Transformiix'">
           <!-- Non Mozilla specific markup -->
-          <div class="pie" id="chart_incoming_qtypes">[graph incoming qtypes]</div>
+          <div class="pie" id="chart_incoming_qtypes">[graph of incoming qtypes]</div>
         </xsl:if>
         <table class="counters">
           <xsl:for-each select="server/counters[@type=&quot;qtype&quot;]/counter">
diff --git a/bin/named/bind9.xsl.h b/bin/named/bind9.xsl.h
index 2ef0acf2100..b1a3bfb9ba9 100644
--- a/bin/named/bind9.xsl.h
+++ b/bin/named/bind9.xsl.h
@@ -56,9 +56,10 @@ static char xslmsg[] =
 	" // Server Incoming query Types\n"
 	" while(g = graphs.shift()){\n"
 	" // alert(\"going for: \" + g.target);\n"
+	" if(g.data.length > 1){\n"
 	" drawChart(g.title,g.target,g.data);\n"
 	" }\n"
-	" \n"
+	" }\n"
 	" }\n"
 	" \n"
 	" // Server Incoming Queries Types \n"