From ff6b69b37e9e47b5627ed210a4a407710a63398f Mon Sep 17 00:00:00 2001
From: orbiter <orbiter@6c8d7289-2bf4-0310-a012-ef5d649a1542>
Date: Sun, 3 Feb 2008 21:47:27 +0000
Subject: [PATCH] fix for NPE in access tracker fix for NPE in word index

git-svn-id: https://svn.berlios.de/svnroot/repos/yacy/trunk@4439 6c8d7289-2bf4-0310-a012-ef5d649a1542
---
 htroot/AccessTracker_p.html                  | 6 ------
 htroot/AccessTracker_p.java                  | 4 ----
 htroot/WatchCrawler_p.html                   | 2 +-
 source/de/anomic/plasma/plasmaWordIndex.java | 2 ++
 yacy.init                                    | 6 +++---
 5 files changed, 6 insertions(+), 14 deletions(-)

diff --git a/htroot/AccessTracker_p.html b/htroot/AccessTracker_p.html
index b26a23dae..c73694500 100644
--- a/htroot/AccessTracker_p.html
+++ b/htroot/AccessTracker_p.html
@@ -61,7 +61,6 @@
         <td>Offset</td>
         <td>Expected Results</td>
         <td>Returned Results</td>
-        <td>Expected Time (ms)</td>
         <td>Used Time (ms)</td>
         <td>URL fetch (ms)</td>
         <td>Snippet comp (ms)</td>
@@ -74,7 +73,6 @@
         <td>#[offset]#</td>
         <td>#[querycount]#</td>
         <td>#[resultcount]#</td>
-        <td>#[querytime]#</td>
         <td>#[resulttime]#</td>
         <td>#[urltime]#</td>
         <td>#[snippettime]#</td>
@@ -87,7 +85,6 @@
         <td></td>
         <td>&#216; #[querycount_avg]#</td>
         <td>&#216; #[resultcount_avg]#</td>
-        <td>&#216; #[querytime_avg]#</td>
         <td>&#216; #[resulttime_avg]#</td>
         <td>&#216; #[urltime_avg]#</td>
         <td>&#216; #[snippettime_avg]#</td>
@@ -131,7 +128,6 @@
         <td>Date</td>
         <td>Expected Results</td>
         <td>Returned Results</td>
-        <td>Expected Time (ms)</td>
         <td>Used Time (ms)</td>
         <td>URL fetch (ms)</td>
         <td>Snippet comp (ms)</td>
@@ -144,7 +140,6 @@
         <td>#[date]#</td>
         <td>#[querycount]#</td>
         <td>#[resultcount]#</td>
-        <td>#[querytime]#</td>
         <td>#[resulttime]#</td>
         <td>#[urltime]#</td>
         <td>#[snippettime]#</td>
@@ -157,7 +152,6 @@
         <td></td>
         <td>&#216; #[querycount_avg]#</td>
         <td>&#216; #[resultcount_avg]#</td>
-        <td>&#216; #[querytime_avg]#</td>
         <td>&#216; #[resulttime_avg]#</td>
         <td>&#216; #[urltime_avg]#</td>
         <td>&#216; #[snippettime_avg]#</td>
diff --git a/htroot/AccessTracker_p.java b/htroot/AccessTracker_p.java
index 259089238..de7bfe5a0 100644
--- a/htroot/AccessTracker_p.java
+++ b/htroot/AccessTracker_p.java
@@ -133,7 +133,6 @@ public class AccessTracker_p {
             HashMap<String, Object> searchProfile;
             int m = Math.min(maxCount, array.size());
             long qcountSum = 0;
-            long qtimeSum = 0;
             long rcountSum = 0;
             long utimeSum = 0;
             long stimeSum = 0;
@@ -159,13 +158,11 @@ public class AccessTracker_p {
                     prop.put("page_list_" + entCount + "_queryhashes", plasmaSearchQuery.anonymizedQueryHashes((Set<String>) searchProfile.get("queryhashes")));
                 }
                 prop.putNum("page_list_" + entCount + "_querycount", ((Integer) searchProfile.get("querycount")).longValue());
-                prop.putNum("page_list_" + entCount + "_querytime", ((Long) searchProfile.get("querytime")).longValue());
                 prop.putNum("page_list_" + entCount + "_resultcount", ((Integer) searchProfile.get("resultcount")).longValue());
                 prop.putNum("page_list_" + entCount + "_urltime", ((Long) searchProfile.get("resulturltime")).longValue());
                 prop.putNum("page_list_" + entCount + "_snippettime", ((Long) searchProfile.get("resultsnippettime")).longValue());
                 prop.putNum("page_list_" + entCount + "_resulttime", ((Long) searchProfile.get("resulttime")).longValue());
                 qcountSum += ((Integer) searchProfile.get("querycount")).intValue();
-                qtimeSum += ((Long) searchProfile.get("querytime")).longValue();
                 rcountSum += ((Integer) searchProfile.get("resultcount")).intValue();
                 utimeSum += ((Long) searchProfile.get("resulturltime")).longValue();
                 stimeSum += ((Long) searchProfile.get("resultsnippettime")).longValue();
@@ -177,7 +174,6 @@ public class AccessTracker_p {
             // Put -1 instead of NaN as result for empty search list
             if (m == 0) m = -1;
             prop.putNum("page_querycount_avg", (double)qcountSum/m);
-            prop.putNum("page_querytime_avg", (double)qtimeSum/m);
             prop.putNum("page_resultcount_avg", (double)rcountSum/m);
             prop.putNum("page_urltime_avg", (double)utimeSum/m);
             prop.putNum("page_snippettime_avg", (double)stimeSum/m);
diff --git a/htroot/WatchCrawler_p.html b/htroot/WatchCrawler_p.html
index 6d335fd02..c272e7545 100644
--- a/htroot/WatchCrawler_p.html
+++ b/htroot/WatchCrawler_p.html
@@ -1,6 +1,6 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
-#(forwardToCrawlStart)#::<meta http-equiv="REFRESH" content="0;/CrawlStartSimple_p.html">#(/forwardToCrawlStart)#
+#(forwardToCrawlStart)#::<meta http-equiv="REFRESH" content="0; url=/CrawlStartSimple_p.html">#(/forwardToCrawlStart)#
 <head>
 <title>YaCy '#[clientname]#': Crawler Queues</title>
 #%env/templates/metas.template%# 
diff --git a/source/de/anomic/plasma/plasmaWordIndex.java b/source/de/anomic/plasma/plasmaWordIndex.java
index 4bbd7cd46..4020bd885 100644
--- a/source/de/anomic/plasma/plasmaWordIndex.java
+++ b/source/de/anomic/plasma/plasmaWordIndex.java
@@ -363,6 +363,8 @@ public final class plasmaWordIndex implements indexRI {
             }
         }
         
+        if (container == null) return null;
+        
         // check doubles
         int beforeDouble = container.size();
         ArrayList<kelondroRowSet> d = container.removeDoubles();
diff --git a/yacy.init b/yacy.init
index ac58b2a98..85a268146 100644
--- a/yacy.init
+++ b/yacy.init
@@ -658,10 +658,10 @@ javastart_priority__pro=0
 # ram cache during indexing. When YaCy is shut down, this cache must be
 # flushed to disc; this may last some minutes.
 wordCacheMaxCount = 20000
-wordCacheInitCount = 30000
+wordCacheInitCount = 20000
 wordFlushSize = 500
-wordCacheMaxCount__pro = 60000
-wordCacheInitCount__pro = 80000
+wordCacheMaxCount__pro = 20000
+wordCacheInitCount__pro = 20000
 wordFlushSize__pro = 500
 
 # Specifies if yacy can be used as transparent http proxy.