fix for http://bugs.yacy.net/view.php?id=12

git-svn-id: https://svn.berlios.de/svnroot/repos/yacy/trunk@7665 6c8d7289-2bf4-0310-a012-ef5d649a1542
yacy · Apr 17, 2011 · 08108f0 · 08108f0
1 parent fd3baa9
commit 08108f0
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 9 deletions.
diff --git a/htroot/index.html b/htroot/index.html
@@ -85,20 +85,22 @@ <h2 class="yacy">
           </td>
         </tr>
         <tr>
+          #(resource-select)#::
           <td><label for="resource">Resource</label>:</td>
           <td>
             <select id="resource" name="resource">
-              <option value="global" #(resource-global)#::selected="selected"#(/resource-global)#
-                      #(resource-global-disabled)#::disabled="disabled"#(/resource-global-disabled)#>global</option>
-              <option value="local" #(resource-local)#::selected="selected"#(/resource-local)#>local</option>
+              <option value="global" #(global)#::selected="selected"#(/global)#
+                      #(global-disabled)#::disabled="disabled"#(/global-disabled)#>global</option>
+              <option value="local" #(local)#::selected="selected"#(/local)#>local</option>
             </select>
-            #(resource-global-disabled)#::
+            #(global-disabled)#::
             Global search is disabled because<br />#(reason)# 
               <a class="lock" href="ConfigNetwork_p.html">DHT Distribution</a> is::
               <a class="lock" href="ConfigNetwork_p.html">Index Receive</a> is::
               <a class="lock" href="ConfigNetwork_p.html">DHT Distribution and Index Receive</a> are#(/reason)# 
-            disabled.#(/resource-global-disabled)#
+            disabled.#(/global-disabled)#
           </td>
+          #(/resource-select)#
         </tr>
         <tr>
           <td><label for="urlmaskfilter">URL mask</label>:</td>

diff --git a/htroot/index.java b/htroot/index.java
@@ -102,10 +102,11 @@ public static serverObjects respond(final RequestHeader header, final serverObje
         prop.put("searchoptions_count-10", (count == 10) ? "1" : "0");
         prop.put("searchoptions_count-50", (count == 50) ? "1" : "0");
         prop.put("searchoptions_count-100", (count == 100) ? "1" : "0");
-        prop.put("searchoptions_resource-global", global ? "1" : "0");
-        prop.put("searchoptions_resource-global-disabled", (indexReceiveGranted && indexDistributeGranted) ? "0" : "1");
-        prop.put("searchoptions_resource-global-disabled_reason", (indexReceiveGranted) ? "0" : (indexDistributeGranted ? "1" : "2"));
-        prop.put("searchoptions_resource-local", global ? "0" : "1");
+        prop.put("searchoptions_resource-select", sb.peers.sizeConnected() > 0 ? 1 : 0);
+        prop.put("searchoptions_resource-select_global", global ? "1" : "0");
+        prop.put("searchoptions_resource-select_global-disabled", (indexReceiveGranted && indexDistributeGranted) ? "0" : "1");
+        prop.put("searchoptions_resource-select_global-disabled_reason", (indexReceiveGranted) ? "0" : (indexDistributeGranted ? "1" : "2"));
+        prop.put("searchoptions_resource-select_local", global ? "0" : "1");
         prop.put("searchoptions_urlmaskoptions", "0");
         prop.putHTML("searchoptions_urlmaskoptions_urlmaskfilter", urlmaskfilter);
         prop.put("searchoptions_prefermaskoptions", "0");