From c47bb1182dd13b9ed8c99d2107d4206487173650 Mon Sep 17 00:00:00 2001
From: orbiter <orbiter@6c8d7289-2bf4-0310-a012-ef5d649a1542>
Date: Tue, 16 Aug 2005 11:43:14 +0000
Subject: [PATCH] bugfix for assortment initialization error

git-svn-id: https://svn.berlios.de/svnroot/repos/yacy/trunk@547 6c8d7289-2bf4-0310-a012-ef5d649a1542
---
 doc/Links.html                                         | 4 ++--
 doc/index.html                                         | 2 +-
 htroot/index.html                                      | 2 +-
 htroot/yacy/transferRWI.java                           | 2 +-
 source/de/anomic/plasma/plasmaWordIndexAssortment.java | 5 +++--
 startYACY.sh                                           | 1 +
 6 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/doc/Links.html b/doc/Links.html
index caab068a0..e330db984 100644
--- a/doc/Links.html
+++ b/doc/Links.html
@@ -54,8 +54,8 @@ globalheader();
 
 <p>Other YaCy Project Sites
 <ul>
-<li><a href="http://www.suma-lab.de/yacy/"><b>German documentation</b></a> - from Alexander Schier</li>
-<li><a href="http://www.yacy-forum.de"><b>Deutsches Forum</b></a></li>
+<li><a href="http://www.yacy-websuche.de/"><b>German documentation</b></a> - Wiki, administrated and initiated by Alexander Schier</li>
+<li><a href="http://www.yacy-forum.de"><b>Deutsches Forum</b></a>, administrated by Roland Ramthun</li>
 <li><a href="http://sourceforge.net/forum/?group_id=116142"><b>English Forum</b></a></li>
 <li><a href="http://developer.berlios.de/projects/yacy/"><b>YaCy at BerliOS</b> - our SVN hosting service</li>
 <li><a href="http://freshmeat.net/projects/yacyproxy/"><b>YaCy at fresmeat.net</b></a> - Project Announcement Page (please click here to support the project and enhance Rating/Popularity)</li>
diff --git a/doc/index.html b/doc/index.html
index aa91cdcc7..faf835207 100644
--- a/doc/index.html
+++ b/doc/index.html
@@ -96,7 +96,7 @@ globalheader();
 <H2>YaCy<br><br>
 &nbsp;<FONT SIZE="4">p2p-based distributed Web Search Engine</FONT></H2><br>
 
-<p><i>F&uuml;r eine deutsche Dokumentation sehen sie bitte <a href="http://www.suma-lab.de/yacy/">hier</a></p>
+<p><i>F&uuml;r eine deutsche Dokumentation sehen sie bitte <a href="http://www.yacy-websuche.de/">hier</a></p>
 <br>
 <table border="0" cellspacing="1" cellpadding="3" width="100%">
 
diff --git a/htroot/index.html b/htroot/index.html
index a17b6ee40..b14449595 100644
--- a/htroot/index.html
+++ b/htroot/index.html
@@ -129,7 +129,7 @@ You can enrich the search results by using the 'global' option; you must also sw
 <hr>
 <center><i>YaCy is a GPL'ed project
 with the target of implementing a P2P-based global search engine.<br>
-Architecture and implementation (C) by Michael Peter Christen,
+Architecture (C) by Michael Peter Christen,
 <img src="/env/grafics/mcemailh.gif"></i></center>
 
 #[footer]#
diff --git a/htroot/yacy/transferRWI.java b/htroot/yacy/transferRWI.java
index d983bd922..d86182c67 100644
--- a/htroot/yacy/transferRWI.java
+++ b/htroot/yacy/transferRWI.java
@@ -127,7 +127,7 @@ public class transferRWI {
             yacySeed otherPeer = yacyCore.seedDB.get(iam);
             String otherPeerName = iam + ":" + ((otherPeer == null) ? "NULL" : (otherPeer.getName() + "/" + otherPeer.getVersion()));
             if (wordhashes.length == 0)
-                switchboard.getLog().logInfo("Received 0 Words from " + otherPeerName + ", requested " + unknownURL.size() + " URLs");
+                switchboard.getLog().logInfo("Received 0 RWIs from " + otherPeerName + ", requested " + unknownURL.size() + " URLs");
             else {
                 double avdist = (yacyDHTAction.dhtDistance(yacyCore.seedDB.mySeed.hash, wordhashes[0]) + yacyDHTAction.dhtDistance(yacyCore.seedDB.mySeed.hash, wordhashes[wordhashes.length - 1])) / 2.0;
                 switchboard.getLog().logInfo("Received " + received + " Words [" + wordhashes[0] + " .. " + wordhashes[wordhashes.length - 1] + "]/" + avdist + " from " + otherPeerName + ", requested " + unknownURL.size() + " URLs");
diff --git a/source/de/anomic/plasma/plasmaWordIndexAssortment.java b/source/de/anomic/plasma/plasmaWordIndexAssortment.java
index 27cfdbd95..852521c2c 100644
--- a/source/de/anomic/plasma/plasmaWordIndexAssortment.java
+++ b/source/de/anomic/plasma/plasmaWordIndexAssortment.java
@@ -113,15 +113,16 @@ public final class plasmaWordIndexAssortment {
                 if (log != null) log.logSystem("Opened Assortment Database, " + assortments.size() + " entries, width " + assortmentLength + ", " + bufferkb + "kb buffer"); 
                 return;
             } catch (IOException e){
-                if (log != null) log.logError("unable to open assortment database, creating new: " + e.getMessage(), e);
+                serverLog.logError("PLASMA", "unable to open assortment database, creating new: " + e.getMessage(), e);
             }
+            assortmentFile.delete(); // make space for new one
         }
         // create new assortment tree file
         try {
             assortments = new kelondroTree(assortmentFile, bufferSize, bufferStructure(assortmentLength));
             if (log != null) log.logSystem("Created new Assortment Database, width " + assortmentLength + ", " + bufferkb + "kb buffer");
         } catch (IOException e){
-            if (log != null) log.logError("unable to create assortment database: " + e.getMessage(), e);
+            serverLog.logError("PLASMA", "unable to create assortment database: " + e.getMessage(), e);
         }
     }
 
diff --git a/startYACY.sh b/startYACY.sh
index 782bf7437..e0cc64a40 100755
--- a/startYACY.sh
+++ b/startYACY.sh
@@ -21,6 +21,7 @@ else
 		nohup java -classpath classes:htroot:$CLASSPATH yacy >> yacy.log &
 	else
 		nohup java -classpath classes:htroot:$CLASSPATH yacy > /dev/null &
+#		nohup java -Xms160m -Xmx160m -classpath classes:htroot:$CLASSPATH yacy > /dev/null &
 	fi
 	echo "YaCy started as daemon process. View it's activity in log/yacy00.log"
 	echo "To stop YaCy, please execute stopYACY.sh and wait some seconds"