From 162a1c690eed24cb923de2cde14e4eda4e23223e Mon Sep 17 00:00:00 2001
From: Tatsuo Ishii <ishii at sraoss.co.jp>
Date: Mon, 16 Aug 2010 06:12:07 +0000
Subject: [PATCH] Refactor pgpool status/summary.

---
 innerSummary.php           |  4 +++-
 templates/innerSummary.tpl | 31 ++++++++++++++++++++++---------
 2 files changed, 25 insertions(+), 10 deletions(-)

diff --git a/innerSummary.php b/innerSummary.php
index 99accbb..e22bcf5 100644
--- a/innerSummary.php
+++ b/innerSummary.php
@@ -19,7 +19,7 @@
  * is" without express or implied warranty.
  *
  * @author     Ryuma Ando <ando@ecomas.co.jp>
- * @copyright  2003-2008 PgPool Global Development Group
+ * @copyright  2003-2010 PgPool Global Development Group
  * @version    CVS: $Id$
  */
 
@@ -30,6 +30,8 @@ if(!isset($_SESSION[SESSION_LOGIN_USER])) {
 }
 
 $params = readConfigParams(array('parallel_mode',
+                                              'master_slave_mode',
+                                              'master_slave_sub_mode',
                                               'enable_query_cache',
                                               'replication_mode',
                                               'load_balance_mode',
diff --git a/templates/innerSummary.tpl b/templates/innerSummary.tpl
index 38177d9..1073a55 100644
--- a/templates/innerSummary.tpl
+++ b/templates/innerSummary.tpl
@@ -9,32 +9,35 @@
 <h3>{$message.strPgpoolSummary|escape}</h3>
 <table>
   <tbody>
-    <tr><td>{$message.strParallelMode|escape}</td>
+    <tr><td>{$message.strReplicationMode|escape}</td>
     <td>
     {if $params.parallel_mode == 'true'}
-    {$message.strPgpool2|escape}
+    {$message.strInvalidation|escape}
+    {elseif $params.replication_mode == 'true'}
+    {$message.strOn|escape}
     {else}
-    {$message.strPgpool1|escape}
+    {$message.strOff|escape}
     {/if}
     </td></tr>
-    <tr><td>{$message.strQueryCache|escape}</td>
+
+    <tr><td>{$message.strMasterSlaveMode|escape}</td>
     <td>
-    {if $params.enable_query_cache == 'true'}
-    {$message.strOn|escape}
+    {if $params.master_slave_mode == 'true'}
+    {$message.strOn|escape}/{$params.master_slave_sub_mode|escape}
     {else}
     {$message.strOff|escape}
     {/if}
     </td></tr>
-    <tr><td>{$message.strReplicationMode|escape}</td>
+
+    <tr><td>{$message.strParallelMode|escape}</td>
     <td>
     {if $params.parallel_mode == 'true'}
-    {$message.strInvalidation|escape}
-    {elseif $params.replication_mode == 'true'}
     {$message.strOn|escape}
     {else}
     {$message.strOff|escape}
     {/if}
     </td></tr>
+
     <tr><td>{$message.strLoadBalanceMode|escape}</td>
     <td>
     {if $params.parallel_mode == 'true'}
@@ -53,6 +56,16 @@
     {$message.strOn|escape}
     {/if}
     </td></tr>
+
+    <tr><td>{$message.strQueryCache|escape}</td>
+    <td>
+    {if $params.enable_query_cache == 'true'}
+    {$message.strOn|escape}
+    {else}
+    {$message.strOff|escape}
+    {/if}
+    </td></tr>
+
   </tbody>
 </table>
 </body>
-- 
2.39.5