diff --git a/build.properties b/build.properties index 80388327f..2077823c0 100644 --- a/build.properties +++ b/build.properties @@ -3,7 +3,7 @@ javacSource=1.5 javacTarget=1.5 # Release Configuration -releaseVersion=0.589 +releaseVersion=0.59 stdReleaseFile=yacy_v${releaseVersion}_${DSTAMP}_${releaseNr}.tar.gz embReleaseFile=yacy_emb_v${releaseVersion}_${DSTAMP}_${releaseNr}.tar.gz proReleaseFile=yacy_pro_v${releaseVersion}_${DSTAMP}_${releaseNr}.tar.gz diff --git a/defaults/yacy.init b/defaults/yacy.init index a6b05ff1d..ad87dcca1 100644 --- a/defaults/yacy.init +++ b/defaults/yacy.init @@ -437,10 +437,8 @@ staticIP= # users to understand what this application does. You can disable browser # pop-up here or set a different start page, like the search page # the browser type is optional and works only under certain conditions -#browserPopUpTrigger=false browserPopUpTrigger=true -#browserPopUpPage=index.html -browserPopUpPage=Status.html +browserPopUpPage=ConfigBasic.html browserPopUpApplication=netscape # index sharing attributes: by default, sharing is on. @@ -595,8 +593,8 @@ javastart_priority__pro=0 # flushed to disc; this may last some minutes. wordCacheMaxCount = 30000 wordCacheInitCount = 30000 -wordCacheMaxCount__pro = 60000 -wordCacheInitCount__pro = 60000 +wordCacheMaxCount__pro = 100000 +wordCacheInitCount__pro = 100000 # Specifies if yacy can be used as transparent http proxy. # diff --git a/htroot/ConfigBasic.java b/htroot/ConfigBasic.java index 66559c46f..51398aa44 100644 --- a/htroot/ConfigBasic.java +++ b/htroot/ConfigBasic.java @@ -201,7 +201,8 @@ public class ConfigBasic { boolean properPort = (sb.webIndex.seedDB.mySeed().isSenior()) || (sb.webIndex.seedDB.mySeed().isPrincipal()); if ((env.getConfig("defaultFiles", "").startsWith("ConfigBasic.html,"))) { - env.setConfig("defaultFiles", env.getConfig("defaultFiles", "").substring(17)); + env.setConfig("defaultFiles", env.getConfig("defaultFiles", "").substring(17)); + env.setConfig("browserPopUpPage", "Status.html"); httpdFileHandler.initDefaultPath(); } diff --git a/htroot/opensearchdescription.xml b/htroot/opensearchdescription.xml index 4606d6ed5..5518a9e18 100644 --- a/htroot/opensearchdescription.xml +++ b/htroot/opensearchdescription.xml @@ -10,11 +10,12 @@ UTF-8 true YaCy is an open-source GPL-licensed software that can be used for stand-alone search engine installations or as a client for a multi-user P2P-based web indexing cluster. This is the access to peer '#[clientname]#'. - + + See http://developer.berlios.de/projects/yacy/ - - YaCy P2P Web Search + + YaCy Open Source P2P Web Search See http://#[thisaddress]#/ViewProfile.html?hash=localhash - YaCy Software © 2004-2007 by Michael Christen et al., YaCy.net; Content: ask peer owner + YaCy Software © 2004-2008 by Michael Christen et al., YaCy.net; Content: ask peer owner open \ No newline at end of file diff --git a/source/yacy.java b/source/yacy.java index d368cd9bc..45072c111 100644 --- a/source/yacy.java +++ b/source/yacy.java @@ -353,7 +353,7 @@ public final class yacy { // open the browser window final boolean browserPopUpTrigger = sb.getConfig("browserPopUpTrigger", "true").equals("true"); if (browserPopUpTrigger) { - String browserPopUpPage = sb.getConfig("browserPopUpPage", "ConfigBasic.html"); + String browserPopUpPage = sb.getConfig("browserPopUpPage", "ConfigBasic.html"); //boolean properPW = (sb.getConfig("adminAccount", "").length() == 0) && (sb.getConfig(httpd.ADMIN_ACCOUNT_B64MD5, "").length() > 0); //if (!properPW) browserPopUpPage = "ConfigBasic.html"; final String browserPopUpApplication = sb.getConfig("browserPopUpApplication", "netscape");