From 99fa265e1d5e573b6aa2be83e7fd796d74f609d5 Mon Sep 17 00:00:00 2001
From: orbiter <orbiter@6c8d7289-2bf4-0310-a012-ef5d649a1542>
Date: Mon, 22 Jun 2009 22:31:29 +0000
Subject: [PATCH] fix for search bug caused by tenant patch

git-svn-id: https://svn.berlios.de/svnroot/repos/yacy/trunk@6125 6c8d7289-2bf4-0310-a012-ef5d649a1542
---
 build.properties                   | 2 +-
 htroot/yacysearch.java             | 4 +++-
 source/de/anomic/search/Query.java | 2 +-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/build.properties b/build.properties
index c960ba598..1d5fe1b65 100644
--- a/build.properties
+++ b/build.properties
@@ -3,7 +3,7 @@ javacSource=1.5
 javacTarget=1.5
 
 # Release Configuration
-releaseVersion=0.85
+releaseVersion=0.86
 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/htroot/yacysearch.java b/htroot/yacysearch.java
index 97c97c135..6f97471ae 100644
--- a/htroot/yacysearch.java
+++ b/htroot/yacysearch.java
@@ -275,7 +275,9 @@ public class yacysearch {
             if (post.containsKey("tenant")) {
                 tenant = post.get("tenant");
                 if (tenant != null && tenant.length() == 0) tenant = null;
-                if (urlmask == null && tenant != null) urlmask = ".*" + tenant + ".*"; else urlmask = ".*" + tenant + urlmask;
+                if (tenant != null) {
+                	if (urlmask == null) urlmask = ".*" + tenant + ".*"; else urlmask = ".*" + tenant + urlmask;
+                }
             }
             int site = querystring.indexOf("site:");
             String sitehash = null;
diff --git a/source/de/anomic/search/Query.java b/source/de/anomic/search/Query.java
index bed77b9e6..5b0bf98a3 100644
--- a/source/de/anomic/search/Query.java
+++ b/source/de/anomic/search/Query.java
@@ -145,7 +145,7 @@ public final class Query {
 		this.queryHashes = queryHashes;
 		this.excludeHashes = excludeHashes;
 		this.fullqueryHashes = fullqueryHashes;
-		this.tenant = tenant;
+		this.tenant = (tenant != null && tenant.length() == 0) ? null : tenant;
 		this.ranking = ranking;
 		this.maxDistance = maxDistance;
 		this.prefer = prefer;