From 2463e5624a16af4c184b911f48815ed4681374e2 Mon Sep 17 00:00:00 2001
From: orbiter <orbiter@6c8d7289-2bf4-0310-a012-ef5d649a1542>
Date: Tue, 26 Sep 2006 23:41:54 +0000
Subject: [PATCH] 'quick' release 0.47 - documentation update - necessary
 bugfixes (missing css for new peers) - reduced effect of search result
 redundancy filter - removed some debug output, but not all

git-svn-id: https://svn.berlios.de/svnroot/repos/yacy/trunk@2665 6c8d7289-2bf4-0310-a012-ef5d649a1542
---
 build.properties                              | 10 +++----
 doc/Material.html                             |  9 +++---
 doc/News.html                                 | 28 +++++++++++++++++++
 .../de/anomic/plasma/plasmaSearchResult.java  |  1 +
 source/de/anomic/yacy/yacyClient.java         |  2 +-
 source/migration.java                         | 18 ++++++------
 6 files changed, 48 insertions(+), 20 deletions(-)

diff --git a/build.properties b/build.properties
index 7198595f5..f450aab8f 100644
--- a/build.properties
+++ b/build.properties
@@ -3,11 +3,11 @@ javacSource=1.4
 javacTarget=1.4
 
 # Release Configuration
-releaseVersion=0.465
-releaseFile=yacy_dev_v${releaseVersion}_${DSTAMP}_${releaseNr}.tar.gz
-#releaseFile=yacy_v${releaseVersion}_${DSTAMP}_${releaseNr}.tar.gz
-releaseDir=yacy_dev_v${releaseVersion}_${DSTAMP}_${releaseNr}
-#releaseDir=yacy_v${releaseVersion}_${DSTAMP}_${releaseNr}
+releaseVersion=0.47
+#releaseFile=yacy_dev_v${releaseVersion}_${DSTAMP}_${releaseNr}.tar.gz
+releaseFile=yacy_v${releaseVersion}_${DSTAMP}_${releaseNr}.tar.gz
+#releaseDir=yacy_dev_v${releaseVersion}_${DSTAMP}_${releaseNr}
+releaseDir=yacy_v${releaseVersion}_${DSTAMP}_${releaseNr}
 releaseFileParentDir=yacy
 releaseNr=$Revision$
 
diff --git a/doc/Material.html b/doc/Material.html
index eb44c667b..bf411f91d 100644
--- a/doc/Material.html
+++ b/doc/Material.html
@@ -54,12 +54,13 @@ globalheader();
 
 <p>Deutsche Dokumentation / German-only documents
 <ul>
-<li><a href="http://www.yacy.net/yacy/material/YaCy-Datenschleuder086.pdf"><b>"YaCy -- Peer-to-Peer Web-Suchmaschine"</b></a> - Ver&ouml;ffentlichung in der Datenschleuder #086; technische Details zur Funktionsweise</li>
-<li><a href="http://www.yacy.net/yacy/material/YaCy-nichtMonopolisierbar.pdf"><b>Vortrag zur SuMa-eV Veranstaltung: "Portale/Suchmaschinen - und ihre Grenzen"</b> - pdf/pr&auml;sentierfertige Folien</a></li>
-<li><a href="http://www.yacy.net/yacy/material/YaCy-nichtMonopolisierbar/index.html"><b>Vortrag zur SuMa-eV Veranstaltung: "Portale/Suchmaschinen - und ihre Grenzen"</b> - Web-Pr&auml;sentation</a></li>
 <li><a href="http://www.yacy.net/yacy/material/YaCy-FlyerD.pdf"><b>Flyer "Das Wichtigste zu YaCy im &Uuml;berblick"</b></a></li>
-<li><a href="http://www.yacy.net/yacy/material/YaCy-22C3Speech.pdf"><b>Speech paper "Distributed Web Search with YaCy" for the 22nd Chaos Communication Congress</b></a></li>
+<li><a href="http://www.yacy.net/yacy/material/YaCy-Entwicklungen2005-2006.pdf"><b>Vortrag zum 3. SuMa-eV Forum: "Suchmaschinen: In Technik, Wirtschaft und Medienkunst" (pdf)</b></a></li>
+<li><a href="http://www.yacy.net/yacy/material/YaCy-Entwicklungen2005-2006.html"><b>Vortrag zum 3. SuMa-eV Forum: "Suchmaschinen: In Technik, Wirtschaft und Medienkunst" (html)</b></a></li>
 <li><a href="http://www.yacy.net/yacy/material/YaCy-PracticalLinuxForumLT2006.pdf"><b>Speech paper "YaCy Peer-to-Peer Web-Suche: Informationsfreiheit und freie Information Retrieval Software" for the 'Practical Linux Forum' at the LinuxTag 2006 Expo in Wiesbaden</b></a></li>
+<li><a href="http://www.yacy.net/yacy/material/YaCy-22C3Speech.pdf"><b>Speech paper "Distributed Web Search with YaCy" for the 22nd Chaos Communication Congress</b></a></li>
+<li><a href="http://www.yacy.net/yacy/material/YaCy-nichtMonopolisierbar.pdf"><b>Vortrag zum 2. SuMa-eV Forum: "Portale/Suchmaschinen - und ihre Grenzen"</b></a></li>
+<li><a href="http://www.yacy.net/yacy/material/YaCy-Datenschleuder086.pdf"><b>"YaCy -- Peer-to-Peer Web-Suchmaschine"</b></a> - Ver&ouml;ffentlichung in der Datenschleuder #086; technische Details zur Funktionsweise</li>
 </ul></p><br>
 
 
diff --git a/doc/News.html b/doc/News.html
index 56d301495..16ab1aac7 100644
--- a/doc/News.html
+++ b/doc/News.html
@@ -84,6 +84,34 @@ globalheader();
 </ul>
 -->
 
+<br><p>v0.47_20060927_2665
+<ul>
+<li>New Features</li>
+  <ul>
+  <li>Exchanged complete html (table-based) interface by new xhtml interface pages</li>
+  <li>Added Crawler/Indexing Monitor</li>
+  <li>Added Surftipps and voting for surftipps, public bookmarks and other public links</li>
+  </ul>
+<li>Technical Enhancements</li>
+  <ul>
+  <li>Added IndexAbstracts Interface for join-Search (not yet working)</li>
+  <li>Added Crawler for ftp protocol</li>
+  <li>Added fully controlled DHT cache</li>
+  <li>Added write cache for LURLs</li>
+  <li>Enabled new Database structures; they are swiched off until testing is finished</li>
+  <li>Refactoring of parser and charset recorgnition</li>
+  <li>Updated versions of external parser</li>
+  <li>Enhanced YaCy SOAP services</li>
+  </ul>
+<li>Bugfixes</li>
+  <ul>
+  <li>fixed wrong ranking calculation</li>
+  <li>fixed version number presentation</li>
+  <li>UTF-8 Bugfixes, better overall handling of non-ascii characters</li>
+  <li>many minor bugfixes</li>
+  </ul>
+</ul>
+
 <br><p>v0.46_20060823_2442
 <ul>
 <li>Web Interface Enhancements</li>
diff --git a/source/de/anomic/plasma/plasmaSearchResult.java b/source/de/anomic/plasma/plasmaSearchResult.java
index a92454eca..a79e9f93f 100644
--- a/source/de/anomic/plasma/plasmaSearchResult.java
+++ b/source/de/anomic/plasma/plasmaSearchResult.java
@@ -188,6 +188,7 @@ public final class plasmaSearchResult {
             shorten = shortenPath(path);
             // scan all subpaths of the url
             while (shorten != null) {
+                if (pageAcc.size() <= query.wantedResults) break;
                 if (paths.containsKey(shorten)) {
                     //System.out.println("deleting path from search result: " + path + " is redundant to " + shorten);
                     try {
diff --git a/source/de/anomic/yacy/yacyClient.java b/source/de/anomic/yacy/yacyClient.java
index 554c55e27..a9c031eb5 100644
--- a/source/de/anomic/yacy/yacyClient.java
+++ b/source/de/anomic/yacy/yacyClient.java
@@ -484,7 +484,7 @@ public final class yacyClient {
             // references  : references (search hints) that was calculated during search
 
             // now create a plasmaIndex out of this result
-            System.out.println("yacyClient: " + ((urlhashes.length() == 0) ? "primary" : "secondary")+ " search result = " + result.toString()); // debug
+            //System.out.println("yacyClient: " + ((urlhashes.length() == 0) ? "primary" : "secondary")+ " search result = " + result.toString()); // debug
             final int results = Integer.parseInt((String) result.get("count"));
             //System.out.println("***result count " + results);
             
diff --git a/source/migration.java b/source/migration.java
index e5e9e2cdf..fb4d80866 100644
--- a/source/migration.java
+++ b/source/migration.java
@@ -54,23 +54,21 @@ public class migration {
     public static void main(String[] args) {
 
     }
-    public static void migrate(plasmaSwitchboard sb){
-        presetPasswords(sb);
-        migrateSwitchConfigSettings(sb);
-        migrateWorkFiles(sb);
-    }
+
     public static void migrate(plasmaSwitchboard sb, int fromRev, int toRev){
-    	if(fromRev < toRev){
+        if(fromRev < toRev){
             if(fromRev < TAGDB_WITH_TAGHASH){
                 migrateBookmarkTagsDB(sb);
             }
             if(fromRev < NEW_OVERLAYS){
                 migrateDefaultFiles(sb);
             }
-    		serverLog.logInfo("MIGRATION", "Migrating from "+String.valueOf(fromRev)+ " to "+String.valueOf(toRev));
-            installSkins(sb);
-    		migrate(sb);
-    	}
+            serverLog.logInfo("MIGRATION", "Migrating from "+String.valueOf(fromRev)+ " to "+String.valueOf(toRev));
+            presetPasswords(sb);
+            migrateSwitchConfigSettings(sb);
+            migrateWorkFiles(sb);
+        }
+        installSkins(sb); // FIXME: yes, bad fix for quick release 0.47
     }
     /*
      * remove the static defaultfiles. We use them through a overlay now.