From 736dd86193d2494d35f0ef05fd277c30223a379a Mon Sep 17 00:00:00 2001
From: lotus <lotus@6c8d7289-2bf4-0310-a012-ef5d649a1542>
Date: Thu, 9 Oct 2008 12:48:43 +0000
Subject: [PATCH] - option enableSimpleConfig can disable hidden tables -
 corrected some Xmx values - friendlier welcome message format

git-svn-id: https://svn.berlios.de/svnroot/repos/yacy/trunk@5259 6c8d7289-2bf4-0310-a012-ef5d649a1542
---
 defaults/yacy.init              |  2 ++
 htroot/PerformanceMemory_p.html |  2 +-
 htroot/PerformanceMemory_p.java | 11 +++++++----
 htroot/PerformanceQueues_p.html |  2 +-
 htroot/PerformanceQueues_p.java |  2 ++
 htroot/Status.html              |  2 +-
 yacy.logging                    |  2 +-
 7 files changed, 15 insertions(+), 8 deletions(-)
diff --git a/defaults/yacy.init b/defaults/yacy.init
index 986b51524..aac717f50 100644
--- a/defaults/yacy.init
+++ b/defaults/yacy.init
@@ -814,6 +814,8 @@ svnRevision=0
 
 currentSkin=default
 
+enableSimpleConfig=true
+
 # temporary flag for new database structure. set only true for testing
 # ALL DATA THAT IS CREATED WITH THIS FLAG ON WILL BE VOID IN A FINAL VERSION
 # table-types: RAM = 0, TREE = 1, FLEX = 2;
diff --git a/htroot/PerformanceMemory_p.html b/htroot/PerformanceMemory_p.html
index 456997866..6be1f854a 100644
--- a/htroot/PerformanceMemory_p.html
+++ b/htroot/PerformanceMemory_p.html
@@ -5,7 +5,7 @@
     #%env/templates/metas.template%#
     <script type="text/javascript" src="js/html.js"></script>
   </head>
-  <body id="PerformanceMemory" onload="hide('memory_tables')">
+  <body id="PerformanceMemory" #(enableSimpleConfig)#::onload="hide('memory_tables')"#(/enableSimpleConfig)#>
     <script type="text/javascript"><!--
 	function reloadGraph() {
 	  if(document.forms["optionreloadGraph"].option.checked)
diff --git a/htroot/PerformanceMemory_p.java b/htroot/PerformanceMemory_p.java
index eceac8075..b5130a544 100644
--- a/htroot/PerformanceMemory_p.java
+++ b/htroot/PerformanceMemory_p.java
@@ -53,11 +53,14 @@ public class PerformanceMemory_p {
         if (defaultSettings == null) {
             defaultSettings = serverFileUtils.loadHashMap(new File(env.getRootPath(), "defaults/yacy.init"));
         }
+        
+        prop.put("enableSimpleConfig", env.getConfigBool("enableSimpleConfig", true) ? "1" : "0");
+        
         prop.put("gc", "0");
         if (post != null) {
-            int xmx = 96; // default maximum heap size
+            int xmx = 120; // default maximum heap size
             if (post.containsKey("Xmx")) {
-                try { xmx = Integer.valueOf(post.get("Xmx", "64")).intValue(); } catch (final NumberFormatException e){}
+                try { xmx = Integer.valueOf(post.get("Xmx", "120")).intValue(); } catch (final NumberFormatException e){}
                 env.setConfig("javastart_Xmx", "Xmx" + xmx + "m");
                 env.setConfig("javastart_Xms", "Xms" + xmx + "m");
                 prop.put("setStartupCommit", "1");
@@ -211,9 +214,9 @@ public class PerformanceMemory_p {
         prop.putNum("objectMissCacheTotalMem", totalmissmem / (1024 * 1024d));
 
         // parse initialization memory settings
-        final String Xmx = env.getConfig("javastart_Xmx", "Xmx96m").substring(3);
+        final String Xmx = env.getConfig("javastart_Xmx", "Xmx120m").substring(3);
         prop.put("Xmx", Xmx.substring(0, Xmx.length() - 1));
-        final String Xms = env.getConfig("javastart_Xms", "Xms96m").substring(3);
+        final String Xms = env.getConfig("javastart_Xms", "Xms120m").substring(3);
         prop.put("Xms", Xms.substring(0, Xms.length() - 1));
         
         // other caching structures
diff --git a/htroot/PerformanceQueues_p.html b/htroot/PerformanceQueues_p.html
index f3a527e46..7a3709d0a 100644
--- a/htroot/PerformanceQueues_p.html
+++ b/htroot/PerformanceQueues_p.html
@@ -5,7 +5,7 @@
   #%env/templates/metas.template%#
   <script type="text/javascript" src="js/html.js"></script>
   </head>
-  <body id="PerformanceQueues" onload="hide('expert_settings')">
+  <body id="PerformanceQueues" #(enableSimpleConfig)#::onload="hide('expert_settings')"#(/enableSimpleConfig)#>
   #%env/templates/header.template%#
   #%env/templates/submenuConfig.template%#
   <h2>Performance Settings of Queues and Processes</h2>
diff --git a/htroot/PerformanceQueues_p.java b/htroot/PerformanceQueues_p.java
index 5e831dd1c..08bcd607e 100644
--- a/htroot/PerformanceQueues_p.java
+++ b/htroot/PerformanceQueues_p.java
@@ -72,6 +72,8 @@ public class PerformanceQueues_p {
         final boolean xml = (header.get("PATH")).endsWith(".xml");
         prop.setLocalized(!xml);
         
+        prop.put("enableSimpleConfig", sb.getConfigBool("enableSimpleConfig", true) ? "1" : "0");
+        
         // calculate totals
         long blocktime_total = 0, sleeptime_total = 0, exectime_total = 0;
         while (threads.hasNext()) {
diff --git a/htroot/Status.html b/htroot/Status.html
index c1d623339..11bab1b5d 100644
--- a/htroot/Status.html
+++ b/htroot/Status.html
@@ -41,7 +41,7 @@
     
     <div class="welcome">
     <center>
-      <h2><img src="/env/grafics/kaskelix.png" align="bottom">Welcome to YaCy!</h2>
+      <h2><img src="/env/grafics/kaskelix.png" align="middle" style="margin-right:5px;">Welcome to YaCy!</h2>
       <iframe src="rssTerminal.html?set=PEERNEWS,REMOTESEARCH,LOCALSEARCH,REMOTEINDEXING,LOCALINDEXING,INDEXRECEIVE&width=600px&height=180px&maxlines=20&maxwidth=120"
               width="600" height="180" scrolling="no" name="newsframe"
               marginheight="0" marginwidth="0" frameborder="1"></iframe><br />
diff --git a/yacy.logging b/yacy.logging
index b043c361d..bcd8f88f7 100644
--- a/yacy.logging
+++ b/yacy.logging
@@ -15,7 +15,7 @@ PARSER.level = INFO
 PROXY.level = INFO
 YACY.level = INFO
 HTCACHE.level = INFO
-PLASMA.level = INFO
+PLASMA.level = FINE
 SERVER.level = INFO
 WORDMIGRATION.level = FINE
 FILEHANDLER.level = INFO
