set default ppm when network is switched

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

htroot/IndexControlURLs_p.java

@@ -263,7 +263,7 @@ public class IndexControlURLs_p {
                 while (statsiter.hasNext() && cnt < count) {
                     hs = statsiter.next();
                     prop.put("statisticslines_domains_" + cnt + "_dark", (dark) ? "1" : "0");
-                    prop.put("statisticslines_domains_" + cnt + "_domain", hs.hostname);
+                    prop.put("statisticslines_domains_" + cnt + "_domain", hs.hostname + ((hs.port == 80) ? "" : ":" + hs.port));
                     prop.put("statisticslines_domains_" + cnt + "lines", count);
                     prop.put("statisticslines_domains_" + cnt + "_hashpart", hs.hosthash);
                     prop.put("statisticslines_domains_" + cnt + "_count", hs.count);

source/de/anomic/index/indexRepositoryReference.java

@@ -556,13 +556,17 @@ public final class indexRepositoryReference {
         count += 10; // make some more to prevent that we have to do this again after deletions too soon.
         if (count < 0 || count > s.size()) count = s.size();
         statsDump = new ArrayList<hostStat>();
+        indexURLReference.Components comps;
+        yacyURL url;
         while (j.hasNext()) {
             urlhash = j.next();
             if (urlhash == null) continue;
             urlref = this.load(urlhash, null, 0);
             if (urlref == null || urlref.comp() == null || urlref.comp().url() == null || urlref.comp().url().getHost() == null) continue;
             if (statsDump == null) return new ArrayList<hostStat>().iterator(); // some other operation has destroyed the object
-            statsDump.add(new hostStat(urlref.comp().url().getHost(), urlhash.substring(6), s.getScore(urlhash)));
+            comps = urlref.comp();
+            url = comps.url();
+            statsDump.add(new hostStat(url.getHost(), url.getPort(), urlhash.substring(6), s.getScore(urlhash)));
             count--;
             if (count == 0) break;
         }
@@ -581,10 +585,12 @@ public final class indexRepositoryReference {
     
     public class hostStat {
         public String hostname, hosthash;
+        public int port;
         public int count;
-        public hostStat(String host, String urlhashfragment, int count) {
+        public hostStat(String host, int port, String urlhashfragment, int count) {
             assert urlhashfragment.length() == 6;
             this.hostname = host;
+            this.port = port;
             this.hosthash = urlhashfragment;
             this.count = count;
         }

source/de/anomic/plasma/plasmaSwitchboard.java

@@ -300,11 +300,7 @@ public final class plasmaSwitchboard extends serverAbstractSwitch<IndexingStack.
         
         // set network-specific performance attributes
         if (this.firstInit) {
-            int remotecrawl_ppm = Math.max(1, (int) getConfigLong("network.unit.remotecrawl.speed", 60));
+            setRemotecrawlPPM(Math.max(1, (int) getConfigLong("network.unit.remotecrawl.speed", 60)));
-            setConfig(plasmaSwitchboardConstants.CRAWLJOB_REMOTE_TRIGGERED_CRAWL_BUSYSLEEP, 60000 / remotecrawl_ppm);
-            setConfig(plasmaSwitchboardConstants.CRAWLJOB_REMOTE_TRIGGERED_CRAWL_IDLESLEEP, Math.max(10000, 180000 / remotecrawl_ppm));
-            setConfig(plasmaSwitchboardConstants.CRAWLJOB_REMOTE_CRAWL_LOADER_BUSYSLEEP, Math.max(15000, 1800000 / remotecrawl_ppm));
-            setConfig(plasmaSwitchboardConstants.CRAWLJOB_REMOTE_CRAWL_LOADER_IDLESLEEP, Math.max(30000, 3600000 / remotecrawl_ppm));
         }
         
         // start indexing management
@@ -763,6 +759,15 @@ public final class plasmaSwitchboard extends serverAbstractSwitch<IndexingStack.
                 log.logInfo("RANDOM PASSWORD REMOVED! User must set a new password");
             }
         }
+        // set the network-specific remote crawl ppm
+        setRemotecrawlPPM(Math.max(1, (int) getConfigLong("network.unit.remotecrawl.speed", 60)));
+    }
+    
+    private void setRemotecrawlPPM(int ppm) {
+        setConfig(plasmaSwitchboardConstants.CRAWLJOB_REMOTE_TRIGGERED_CRAWL_BUSYSLEEP, 60000 / ppm);
+        setConfig(plasmaSwitchboardConstants.CRAWLJOB_REMOTE_TRIGGERED_CRAWL_IDLESLEEP, Math.max(10000, 180000 / ppm));
+        setConfig(plasmaSwitchboardConstants.CRAWLJOB_REMOTE_CRAWL_LOADER_BUSYSLEEP, Math.max(15000, 1800000 / ppm));
+        setConfig(plasmaSwitchboardConstants.CRAWLJOB_REMOTE_CRAWL_LOADER_IDLESLEEP, Math.max(30000, 3600000 / ppm));
     }
     
     public void initMessages() {