some minor changes here and there

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

source/de/anomic/kelondro/kelondroRecords.java

@@ -1487,7 +1487,7 @@ public class kelondroRecords {
             this.entryFile.close();
             this.entryFile = null;
             this.cacheHeaders = null;
-            theLogger.fine("close(): file '" + this.filename + "' closed.");
+            theLogger.fine("file '" + this.filename + "' closed.");
         }
     }
 

source/de/anomic/plasma/plasmaCrawlNURL.java

@@ -98,6 +98,7 @@ public class plasmaCrawlNURL {
         0
         );
     
+    private kelondroIndex urlIndexFile = null;
     private final plasmaCrawlBalancer coreStack;      // links found by crawling to depth-1
     private final plasmaCrawlBalancer limitStack;     // links found by crawling at target depth
     private final plasmaCrawlBalancer overhangStack;  // links found by crawling at depth+1
@@ -109,11 +110,8 @@ public class plasmaCrawlNURL {
     private final HashSet imageStackIndex, movieStackIndex, musicStackIndex; // to find out if a specific link is already on any stack
     private File cacheStacksPath;
     private long preloadTime;
-    initStackIndex initThead;
+    private initStackIndex initThead;
     
-    // the class object
-    private kelondroIndex urlIndexFile = null;
-
     public plasmaCrawlNURL(File cachePath, long preloadTime) {
         super();
         this.cacheStacksPath = cachePath;
@@ -164,10 +162,6 @@ public class plasmaCrawlNURL {
         
     }
     
-    public boolean getUseNewDB() {
-        return (urlIndexFile instanceof kelondroFlexTable);
-    }
-    
     private void openHashCache() {
         String newCacheName = "urlNotice5.table";
         cacheStacksPath.mkdirs();
@@ -190,7 +184,6 @@ public class plasmaCrawlNURL {
     }
     
     public void close() {
-        try {urlIndexFile.close();} catch (IOException e) {}
         coreStack.close();
         limitStack.close();
         overhangStack.close();

yacy.init

@@ -479,13 +479,13 @@ xpstopw=true
 40_peerseedcycle_idlesleep=1800000
 40_peerseedcycle_busysleep=1200000
 40_peerseedcycle_memprereq=2097152
-50_localcrawl_idlesleep=1000
+50_localcrawl_idlesleep=2000
 50_localcrawl_busysleep=250
-50_localcrawl_memprereq=2097152
+50_localcrawl_memprereq=4194304
 50_localcrawl_isPaused=false
 61_globalcrawltrigger_idlesleep=10000
 61_globalcrawltrigger_busysleep=500
-61_globalcrawltrigger_memprereq=2097152
+61_globalcrawltrigger_memprereq=4194304
 61_globalcrawltrigger_isPaused=false
 62_remotetriggeredcrawl_idlesleep=10000
 62_remotetriggeredcrawl_busysleep=1000
@@ -558,10 +558,10 @@ ramCacheProfiles_time=      500
 # is valid in unix/shell and windows environments but
 # not for first startup of YaCy
 
-# -Xmx<size> set maximum Java heap size
+# -Xmx<size> and -Xms<size> maximum/init Java heap size
+# both values should be equal,
+# othervise the YaCy-internal memory supervision does not work
 javastart_Xmx=Xmx96m
-
-# -Xms<size> set initial Java heap size
 javastart_Xms=Xms96m
 
 # priority of the yacy-process
@@ -813,7 +813,7 @@ currentSkin=
 # temporary flag for new database structure. set only true for testing
 # ALL DATA THAT IS CREATED WITH THIS FLAG ON WILL BE VOID IN A FINAL VERSION
 # table-types: RAM = 0, TREE = 1, FLEX = 2;
-tableTypeForPreNURL=2
+tableTypeForPreNURL=0
 
 # flag to show surftipps on index.html page
 showSurftipps = true