From a8548c0484595d316f9f8be8e3fa984b6572fc33 Mon Sep 17 00:00:00 2001 From: orbiter Date: Wed, 1 Mar 2006 23:24:57 +0000 Subject: [PATCH] * several bugfixes regarding basic configuration * extended number of search target peers git-svn-id: https://svn.berlios.de/svnroot/repos/yacy/trunk@1794 6c8d7289-2bf4-0310-a012-ef5d649a1542 --- htroot/ConfigBasic.html | 13 ++++++++++--- htroot/ConfigBasic.java | 5 ++++- htroot/ConfigProfile_p.html | 2 +- source/de/anomic/plasma/plasmaSearchEvent.java | 5 +++-- 4 files changed, 18 insertions(+), 7 deletions(-) diff --git a/htroot/ConfigBasic.html b/htroot/ConfigBasic.html index d7fa245e6..c69280f8c 100644 --- a/htroot/ConfigBasic.html +++ b/htroot/ConfigBasic.html @@ -25,7 +25,7 @@ Your YaCy Peer needs some basic information to operate properly
  1. #(statusName)#Your peer name has not been customized; please set your own peer name::You have a nice peer name#(/statusName)#
    Peer Name:
    2. -
  2. #(statusPassword)#Please set a password for your peer to protect your settings::Password is set#(/statusPassword)#
    +
  3. #(statusPassword)#Please set a password for your peer to protect your settings (> 3 characters); if this is successful you will be asked to log in with these values immediately::Password is set#(/statusPassword)#
    Peer User:
    Peer Password:
    Peer Password: (repeat same password)
    4. @@ -35,9 +35,16 @@ Your YaCy Peer needs some basic information to operate properly
         -What You should do next: +

    What You should do next:
    #(nextStep)# -Your basic configuration is complete, you can start searching, start your own crawl, or just monitor at the network page what the other peers are doing.:: +Your basic configuration is complete! You can now (for example): +

    :: Your Peer name is a default name; please set another peer name. If this does not work, the name is probably taken by someone else. Please try to choose another one.:: You did not set a user name and/or a password. Some pages are protected by passwords. You should set a password here to secure your yacy peer.:: You did not open a port in your firewall or your router does not forward the server port to your peer. This is needed if you want to fully participate in the YaCy network. You can also use your peer without opening your peer, but this is not recomended. diff --git a/htroot/ConfigBasic.java b/htroot/ConfigBasic.java index 81f524df4..ccac99345 100644 --- a/htroot/ConfigBasic.java +++ b/htroot/ConfigBasic.java @@ -86,10 +86,13 @@ public class ConfigBasic { String port = (post == null) ? env.getConfig("port", "8080") : (String) post.get("port", "8080"); // admin password - if ((user.length() > 0) && (pw1.equals(pw2))) { + if ((user.length() > 0) && (pw1.length() > 3) && (pw1.equals(pw2))) { // check passed. set account: env.setConfig("adminAccountBase64MD5", serverCodings.encodeMD5Hex(kelondroBase64Order.standardCoder.encodeString(user + ":" + pw1))); env.setConfig("adminAccount", ""); + // authenticate immediately + //prop.put("AUTHENTICATE", "admin log-in"); + //return prop; } // check if peer name already exists diff --git a/htroot/ConfigProfile_p.html b/htroot/ConfigProfile_p.html index e3af9ca53..d0fec4de2 100644 --- a/htroot/ConfigProfile_p.html +++ b/htroot/ConfigProfile_p.html @@ -13,7 +13,7 @@ You can create a personal profile here. Other YaCy users can view these information using a link on the network page.
    You do not need to provide any personal data here, but if you want to distribute your contact information, you can do that here.

    -
    + diff --git a/source/de/anomic/plasma/plasmaSearchEvent.java b/source/de/anomic/plasma/plasmaSearchEvent.java index ab2d01417..2d4fdb223 100644 --- a/source/de/anomic/plasma/plasmaSearchEvent.java +++ b/source/de/anomic/plasma/plasmaSearchEvent.java @@ -107,8 +107,9 @@ public final class plasmaSearchEvent extends Thread implements Runnable { // combine all threads if (query.domType == plasmaSearchQuery.SEARCHDOM_GLOBALDHT) { - int fetchpeers = (int) (query.maximumTime / 1000L); // number of target peers; means 10 peers in 10 seconds - if (fetchpeers > 10) fetchpeers = 10; + int fetchpeers = (int) (query.maximumTime / 500L); // number of target peers; means 10 peers in 10 seconds + if (fetchpeers > 50) fetchpeers = 50; + if (fetchpeers < 30) fetchpeers = 30; // remember time long start = System.currentTimeMillis();