bugfixes

git-svn-id: https://svn.berlios.de/svnroot/repos/yacy/trunk@320 6c8d7289-2bf4-0310-a012-ef5d649a1542
yacy · Jun 23, 2005 · 56d28a1 · 56d28a1
1 parent d6c8522
commit 56d28a1
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 3 deletions.
diff --git a/htroot/CacheAdmin_p.java b/htroot/CacheAdmin_p.java
@@ -146,6 +146,7 @@ public static serverObjects respond(httpHeader header, serverObjects post, serve
     }
 
     private static String formatHeader(httpHeader header) {
+        if (header == null) return "- no header in header cache -";
         String out = "<table border=\"0\" cellspacing=\"0\" cellpadding=\"0\">";
         Iterator it = header.entrySet().iterator();
         Map.Entry entry;

diff --git a/source/de/anomic/plasma/plasmaSearch.java b/source/de/anomic/plasma/plasmaSearch.java
@@ -153,7 +153,7 @@ public plasmaWordIndexEntity searchHashes(Set hashes, long time) throws IOExcept
             singleResult = wordIndex.getEntity(singleHash, true);
 
             // check result
-            if (singleResult.size() == 0) return new plasmaWordIndexEntity(null); // as this is a cunjunction of searches, we have no result if any word is not known
+            if ((singleResult == null) || (singleResult.size() == 0)) return new plasmaWordIndexEntity(null); // as this is a cunjunction of searches, we have no result if any word is not known
 
             // store result in order of result size
             map.put(serverCodings.enhancedCoder.encodeHex(singleResult.size(), 8) + singleHash, singleResult);

diff --git a/source/de/anomic/plasma/plasmaSwitchboard.java b/source/de/anomic/plasma/plasmaSwitchboard.java
@@ -1199,8 +1199,13 @@ public serverObjects searchFromLocal(Set querywords, String order1, String order
             log.logInfo("INIT WORD SEARCH: " + gs + " - " + count + " links, " + (time / 1000) + " seconds");
             long timestamp = System.currentTimeMillis();
 
-            Thread preselect = new presearch(queryhashes, order, time / 10, urlmask, 5);
-            preselect.start();
+            if (global) {
+                // start a presearch, which makes only sense if we idle afterwards.
+                // this is especially the case if we start a global search and idle until search
+                // results appear from other peers
+                Thread preselect = new presearch(queryhashes, order, time / 10, urlmask, 5);
+                preselect.start();
+            }
 
             // do global fetching
             int globalresults = 0;

diff --git a/source/de/anomic/yacy/yacyCore.java b/source/de/anomic/yacy/yacyCore.java
@@ -324,6 +324,8 @@ public void run() {
                     log.logInfo("publish: handshaked " + this.seed.get("PeerType", "senior") + " peer '" + this.seed.getName() + "' at " + this.seed.getAddress());
                 }
             } catch (Exception e) {
+                log.logError("publishThread: error with target seed " + seed.getMap() + ": " + e.getMessage());
+                e.printStackTrace();
                 this.error = e;
             } finally {
                 this.syncList.add(this);