last changes for release 0.37

git-svn-id: https://svn.berlios.de/svnroot/repos/yacy/trunk@76 6c8d7289-2bf4-0310-a012-ef5d649a1542

doc/Download.html

@@ -34,9 +34,10 @@ You can <a href="http://java.sun.com/j2se/1.4.2/download.html">download the Java
 <p>The Release comes in different flavours: a general one with application wrappers for Unix/Linux, Macintosh OS X and Windows, and a specialized Windows version with Windows installer. Please choose from either one.
 </p>
 
-<p><font size="+1"><b>Latest Release:</b>
+<p><b>Latest Release:</b>
-The latest YaCy-release is 0.36. Download <a href="/yacy/release/yacy_v0.36_20050326.tar.gz"><font size="+1">YaCy 0.36</font></a> here.
+The latest YaCy-release is 0.37.<br>
-</font></p>
+Download <a href="/yacy/release/yacy_v0.37_20050502.tar.gz">YaCy 0.37</a> here.
+</p>
 
 <p><table bgcolor="#EEEEEE" width="100%"><tr><td>
 <fieldset><legend><b>All current and historic releases:</b></legend>

doc/News.html

@@ -37,7 +37,7 @@ globalheader();
 -->
 
 
-<br><p>v0.37
+<br><p>v0.37_build20050502
 <ul>
 <li>YaCy's source code is now hosted in a Subversion/svn version control system on developer.berlios.de: <a href="http://developer.berlios.de/projects/yacy/">yacy@berlios.de</a></li>
 <li>overall speed enhancements:</li>

makerelease.sh

@@ -45,10 +45,10 @@
 # Contributions and changes to the program code must be marked as such.
 
 # define variables
-version='0.369'
+version='0.37'
 datestr=`date +%Y%m%d`
-#release='yacy_v'$version'_'$datestr
+release='yacy_v'$version'_'$datestr
-release='yacy_dev_v'$version'_'$datestr
+#release='yacy_dev_v'$version'_'$datestr
 extralibs='yacy_libx'
 target='RELEASE'
 classes='classes'

source/de/anomic/plasma/plasmaWordIndexRAMCache.java

@@ -171,12 +171,14 @@ public class plasmaWordIndexRAMCache extends Thread {
 	return flushKey(key, "flushSpecific");
     }
     
-    private synchronized int flushKey(String key, String caller) throws IOException {
+    private int flushKey(String key, String caller) throws IOException {
 	Vector v = null;
 	v = (Vector) cache.get(key);
 	if (v == null) return 0; // flushing of nonexisting key
-	cache.remove(key);
+	synchronized (cache) {
-	hashScore.deleteScore(key);
+	    cache.remove(key);
+	    hashScore.deleteScore(key);
+	}
 	pic.addEntriesToIndex(key, v);
 	return v.size();
     }
@@ -213,11 +215,13 @@ public class plasmaWordIndexRAMCache extends Thread {
 	//if (flushc > 0) serverLog.logDebug("PLASMA INDEXING", "addEntryToIndexMem - flushed " + flushc + " entries");
 
 	// put new words into cache
-	Vector v = (Vector) cache.get(wordHash); // null pointer exception? wordhash != null! must be cache==null
+	synchronized (cache) {
-	if (v == null) v = new Vector();
+	    Vector v = (Vector) cache.get(wordHash); // null pointer exception? wordhash != null! must be cache==null
-	v.add(entry);
+	    if (v == null) v = new Vector();
-	cache.put(wordHash, v);
+	    v.add(entry);
-	hashScore.incScore(wordHash);
+	    cache.put(wordHash, v);
+	    hashScore.incScore(wordHash);
+	}
 	return flushc;
     }
     

source/de/anomic/server/serverLog.java

@@ -124,8 +124,10 @@ public final class serverLog {
     private void log(int messageLevel, String message) {
         if (messageLevel <= logLevel) {
 	    System.out.println(l2t[messageLevel] + " " + dateLongString() + " " + appName + " " + message);
-	    lastLog.add(l2t[messageLevel] + " " + dateLongString() + " " + appName + " " + message);
+	    synchronized (lastLog) {
-	    while (lastLog.size() > lastlogMaxSize) lastLog.removeFirst();
+		lastLog.add(l2t[messageLevel] + " " + dateLongString() + " " + appName + " " + message);
+		while (lastLog.size() > lastlogMaxSize) lastLog.removeFirst();
+	    }
 	}
     }
 

source/de/anomic/yacy/yacyClient.java

@@ -92,7 +92,7 @@ public class yacyClient {
             obj.put("mytime", yacyCore.universalDateShortString());
 	    obj.put("seed", yacyCore.seedDB.mySeed.genSeedStr(key));
             result = nxTools.table(httpc.wput(url,
-					      20000, null, null,
+					      105000, null, null,
 					      yacyCore.seedDB.sb.remoteProxyHost,
 					      yacyCore.seedDB.sb.remoteProxyPort,
 					      obj));