- fix for pop-up page upon first start

- added comments in opensearchdescription to explain fast mode
- release 0.59

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

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

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.
 # 

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();
         }
         

htroot/opensearchdescription.xml

@@ -10,11 +10,12 @@
   <InputEncoding>UTF-8</InputEncoding>
   <AdultContent>true</AdultContent>
   <Description>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]#'.</Description>
-  <Url type="application/rss+xml" method="GET" template="http://#[thisaddress]#/yacysearch.rss?search={searchTerms}&amp;Enter=Search" />
+  <Url type="application/rss+xml" method="GET" template="http://#[thisaddress]#/yacysearch.rss?query={searchTerms}&amp;maximumRecords=10&amp;verify=false" />
+  <!-- syntax according to http://www.loc.gov/standards/sru/. Set verify=true to get snippets in the search results -->
   <Developer>See http://developer.berlios.de/projects/yacy/</Developer>
-  <Query role="example" searchTerms="yacy" />
-  <Tags>YaCy P2P Web Search</Tags>
+  <Query role="example" searchTerms="yacy+open+source" />
+  <Tags>YaCy Open Source P2P Web Search</Tags>
   <Contact>See http://#[thisaddress]#/ViewProfile.html?hash=localhash</Contact>
-  <Attribution>YaCy Software &amp;copy; 2004-2007 by Michael Christen et al., YaCy.net; Content: ask peer owner</Attribution>
+  <Attribution>YaCy Software &amp;copy; 2004-2008 by Michael Christen et al., YaCy.net; Content: ask peer owner</Attribution>
   <SyndicationRight>open</SyndicationRight>
 </OpenSearchDescription>

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");