From 5efc0dce0bbba2756ef6d298865a6bb4346c19c1 Mon Sep 17 00:00:00 2001
From: orbiter <orbiter@6c8d7289-2bf4-0310-a012-ef5d649a1542>
Date: Fri, 30 Apr 2010 21:53:20 +0000
Subject: [PATCH] fix for domain options in search box

git-svn-id: https://svn.berlios.de/svnroot/repos/yacy/trunk@6848 6c8d7289-2bf4-0310-a012-ef5d649a1542
---
 defaults/yacy.init     |  2 +-
 htroot/index.html      |  2 ++
 htroot/index.java      | 11 ++++++-----
 htroot/yacysearch.html |  4 +++-
 htroot/yacysearch.java | 11 ++++++-----
 5 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/defaults/yacy.init b/defaults/yacy.init
index 63e4ef864..f115ed269 100644
--- a/defaults/yacy.init
+++ b/defaults/yacy.init
@@ -698,7 +698,7 @@ stacker.slots = 2000
 
 # search domains. If set to false then that search is not available
 search.text = true
-search.images = true
+search.image = true
 search.audio = true
 search.video = true
 search.app = true
diff --git a/htroot/index.html b/htroot/index.html
index c7425c49c..30ba15eea 100644
--- a/htroot/index.html
+++ b/htroot/index.html
@@ -32,6 +32,7 @@
         <input name="query" id="search" type="text" size="52" maxlength="80" value="#[former]#" />
         <input type="submit" name="Enter" value="Search" />
         <input type="hidden" name="verify" value="true" />
+        #(searchdomswitches)#::
         <div class="yacysearch">
 	        #(searchtext)#::<input type="radio" id="text" name="contentdom" value="text" #(check)#::checked="checked"#(/check)# /><label for="text">Text</label>&nbsp;&nbsp;#(/searchtext)#
 	        #(searchimage)#::<input type="radio" id="image" name="contentdom" value="image" #(check)#::checked="checked"#(/check)# /><label for="image">Images</label>&nbsp;&nbsp;#(/searchimage)#
@@ -39,6 +40,7 @@
 	        #(searchvideo)#::<input type="radio" id="video" name="contentdom" value="video" #(check)#::checked="checked"#(/check)# /><label for="video">Video</label>&nbsp;&nbsp;#(/searchvideo)#
 	        #(searchapp)#::<input type="radio" id="app" name="contentdom" value="app" #(check)#::checked="checked"#(/check)# /><label for="app">Applications</label>#(/searchapp)#
         </div>
+        #(/searchdomswitches)#
         <input type="hidden" name="nav" value="all" />
       #(searchoptions)#
         <input type="hidden" name="maximumRecords" value="#[maximumRecords]#" />
diff --git a/htroot/index.java b/htroot/index.java
index 9c4734dc9..fde3de1b6 100644
--- a/htroot/index.java
+++ b/htroot/index.java
@@ -120,12 +120,13 @@ public class index {
         prop.put("depth", "0");
         prop.put("display", display);
         prop.putHTML("constraint", constraint);
+        prop.put("searchdomswitches", sb.getConfigBool("search.text", true) || sb.getConfigBool("search.audio", true) || sb.getConfigBool("search.video", true) || sb.getConfigBool("search.image", true) || sb.getConfigBool("search.app", true) ? 1 : 0);
+        prop.put("searchdomswitches_searchtext", sb.getConfigBool("search.text", true) ? 1 : 0);
+        prop.put("searchdomswitches_searchaudio", sb.getConfigBool("search.audio", true) ? 1 : 0);
+        prop.put("searchdomswitches_searchvideo", sb.getConfigBool("search.video", true) ? 1 : 0);
+        prop.put("searchdomswitches_searchimage", sb.getConfigBool("search.image", true) ? 1 : 0);
+        prop.put("searchdomswitches_searchapp", sb.getConfigBool("search.app", true) ? 1 : 0);
         prop.put("searchoptions_display", display);
-        prop.put("searchtext", sb.getConfigBool("search.text", true) ? 1 : 0);
-        prop.put("searchaudio", sb.getConfigBool("search.audio", true) ? 1 : 0);
-        prop.put("searchvideo", sb.getConfigBool("search.video", true) ? 1 : 0);
-        prop.put("searchimage", sb.getConfigBool("search.image", true) ? 1 : 0);
-        prop.put("searchapp", sb.getConfigBool("search.app", true) ? 1 : 0);
         prop.put("searchtext_check", (contentdom == ContentDomain.TEXT) ? "1" : "0");
         prop.put("searchaudio_check", (contentdom == ContentDomain.AUDIO) ? "1" : "0");
         prop.put("searchvideo_check", (contentdom == ContentDomain.VIDEO) ? "1" : "0");
diff --git a/htroot/yacysearch.html b/htroot/yacysearch.html
index 3381eed47..527c8f363 100644
--- a/htroot/yacysearch.html
+++ b/htroot/yacysearch.html
@@ -69,8 +69,9 @@ $(function() {
       <fieldset class="yacys">
         <input id="search" name="query" type="text" size="50" maxlength="80" value="#[former]#" onclick="document.getElementById('Enter').value = 'Search'" />
         <input id="Enter" type="submit" name="Enter" value="Search" />
+        #(searchdomswitches)#::
         <div class="yacysearch">
-            #(searchtext)#::<input type="radio" id="text" name="contentdom" value="text" #(check)#::checked="checked"#(/check)# /><label for="text">Text</label>&nbsp;&nbsp;#(/searchtext)#
+	        #(searchtext)#::<input type="radio" id="text" name="contentdom" value="text" #(check)#::checked="checked"#(/check)# /><label for="text">Text</label>&nbsp;&nbsp;#(/searchtext)#
 	        #(searchimage)#::<input type="radio" id="image" name="contentdom" value="image" #(check)#::checked="checked"#(/check)# /><label for="image">Images</label>&nbsp;&nbsp;#(/searchimage)#
 	        #(searchaudio)#::<input type="radio" id="audio" name="contentdom" value="audio" #(check)#::checked="checked"#(/check)# /><label for="audio">Audio</label>&nbsp;&nbsp;#(/searchaudio)#
 	        #(searchvideo)#::<input type="radio" id="video" name="contentdom" value="video" #(check)#::checked="checked"#(/check)# /><label for="video">Video</label>&nbsp;&nbsp;#(/searchvideo)#
@@ -78,6 +79,7 @@ $(function() {
             &nbsp;
             <a href="index.html?display=#[display]#&amp;searchoptions=1&amp;count=#[count]#&amp;resource=#[resource]#&amp;urlmaskfilter=#[urlmaskfilter]#&amp;prefermaskfilter=#[prefermaskfilter]#&amp;cat=#[cat]#&amp;constraint=#[constraint]#&amp;contentdom=#[contentdom]#&amp;former=#[former]#&amp;meanCount=#[meanCount]#">more options</a>
         </div>
+        #(/searchdomswitches)#
         <input type="hidden" name="former" value="#[former]#" />
         <input type="hidden" name="maximumRecords" value="#[count]#" />
         <input type="hidden" name="startRecord" value="#[offset]#" />
diff --git a/htroot/yacysearch.java b/htroot/yacysearch.java
index d0a6260a5..95b810ade 100644
--- a/htroot/yacysearch.java
+++ b/htroot/yacysearch.java
@@ -685,11 +685,12 @@ public class yacysearch {
         prop.put("constraint", (constraint == null) ? "" : constraint.exportB64());
         prop.put("verify", (fetchSnippets) ? "true" : "false");
         prop.put("contentdom", (post == null ? "text" : post.get("contentdom", "text")));
-        prop.put("searchtext", sb.getConfigBool("search.text", true) ? 1 : 0);
-        prop.put("searchaudio", sb.getConfigBool("search.audio", true) ? 1 : 0);
-        prop.put("searchvideo", sb.getConfigBool("search.video", true) ? 1 : 0);
-        prop.put("searchimage", sb.getConfigBool("search.image", true) ? 1 : 0);
-        prop.put("searchapp", sb.getConfigBool("search.app", true) ? 1 : 0);
+        prop.put("searchdomswitches", sb.getConfigBool("search.text", true) || sb.getConfigBool("search.audio", true) || sb.getConfigBool("search.video", true) || sb.getConfigBool("search.image", true) || sb.getConfigBool("search.app", true) ? 1 : 0);
+        prop.put("searchdomswitches_searchtext", sb.getConfigBool("search.text", true) ? 1 : 0);
+        prop.put("searchdomswitches_searchaudio", sb.getConfigBool("search.audio", true) ? 1 : 0);
+        prop.put("searchdomswitches_searchvideo", sb.getConfigBool("search.video", true) ? 1 : 0);
+        prop.put("searchdomswitches_searchimage", sb.getConfigBool("search.image", true) ? 1 : 0);
+        prop.put("searchdomswitches_searchapp", sb.getConfigBool("search.app", true) ? 1 : 0);
         prop.put("searchtext_check", (contentdom == ContentDomain.TEXT) ? "1" : "0");
         prop.put("searchaudio_check", (contentdom == ContentDomain.AUDIO) ? "1" : "0");
         prop.put("searchvideo_check", (contentdom == ContentDomain.VIDEO) ? "1" : "0");