Merge branch 'master' of git://git.gitorious.org/yacy/rc1.git

htroot/yacy/search.java

@@ -42,7 +42,6 @@ import net.yacy.cora.document.RSSMessage;
 import net.yacy.cora.protocol.Domains;
 import net.yacy.cora.protocol.HeaderFramework;
 import net.yacy.cora.protocol.RequestHeader;
-import net.yacy.cora.services.federated.yacy.CacheStrategy;
 import net.yacy.cora.sorting.ScoreMap;
 import net.yacy.cora.sorting.WeakPriorityBlockingQueue;
 import net.yacy.document.Autotagging.Metatag;
@@ -238,7 +237,7 @@ public final class search {
                     language,
                     new HashSet<Metatag>(),
                     "", // no navigation
-                    CacheStrategy.CACHEONLY,
+                    null, // no snippet computation
                     count,
                     0,
                     filter,
@@ -301,7 +300,7 @@ public final class search {
                     language,
                     new HashSet<Metatag>(),
                     "", // no navigation
-                    CacheStrategy.CACHEONLY,
+                    null, // no snippet computation
                     count,
                     0,
                     filter,

source/net/yacy/search/index/Segment.java

@@ -73,7 +73,7 @@ public class Segment {
     public static final long wCacheMaxAge    = 1000 * 60 * 30; // milliseconds; 30 minutes
     public static final int  wCacheMaxChunk  =  800;           // maximum number of references for each urlhash
     public static final int  lowcachedivisor =  900;
-    public static final long targetFileSize  = 256 * 1024 * 1024; // 256 MB
+    public static final long targetFileSize  = 64 * 1024 * 1024; // 256 MB
     public static final int  writeBufferSize = 4 * 1024 * 1024;
 
     // the reference factory