Merge branch 'master' of git@gitorious.org:yacy/rc1.git

htroot/Network.html

@@ -143,7 +143,7 @@ document.getElementById("apilink").setAttribute("href", "Network.xml?" + window.
           #(updatedBlog)#::<a href="http://#[address]#/Blog.html?page=#[page]#" title="#[subject]#"><img src="env/grafics/blog.gif" width="54" height="11" alt="Blog updated" /></a>#(/updatedBlog)#
           #(isCrawling)#::<a href="#[page]#"><img src="env/grafics/crawl.gif" width="54" height="11" alt="Crawl" /></a>#(/isCrawling)#
         </nobr></td>
-        <td #(special)#::class="TableCellActive"#(/special)#><a href="goto_p.html?hash=#[hash]#&path=/www/">#[shortname]#</a>#(ssl)#::<img src="env/grafics/lock.gif" width="11" height="15" title="https supported" alt="https supported" />#(/ssl)#</td>
+        <td #(special)#::class="TableCellActive"#(/special)#><a href="goto_p.html?hash=#[hash]#">#[shortname]#</a>#(ssl)#::<img src="env/grafics/lock.gif" width="11" height="15" title="https supported" alt="https supported" />#(/ssl)#</td>
         <td nowrap>
           #(type)##(direct)#<img src="env/grafics/JuniorPassive.gif" width="11" height="11" title="Type: Junior | Contact: passive" alt="Junior passive" />::<img src="env/grafics/JuniorDirect.gif" width="11" height="11" title="Type: Junior | Contact: direct" alt="Junior direct" />::<img src="env/grafics/JuniorOffline.gif" width="11" height="11" title="Type: Junior | Contact: offline" alt="Junior offline" />#(/direct)#::#(direct)#<img src="env/grafics/SeniorPassive.gif" width="11" height="11" title="Type: Senior | Contact: passive" alt="senior passive" />::<img src="env/grafics/SeniorDirect.gif" width="11" height="11" title="Type: Senior | Contact: direct" alt="Senior direct" />::<img src="env/grafics/SeniorOffline.gif" width="11" height="11" title="Type: Senior | Contact: offline" alt="Senior offline" />#(/direct)#::<a href="#[url]#">#(direct)#<img src="env/grafics/PrincipalPassive.gif" width="11" height="11" title="Type: Principal | Contact: passive | Seed download: possible" alt="Principal passive" />::<img src="env/grafics/PrincipalDirect.gif" width="11" height="11" title="Type: Principal | Contact: direct | Seed download: possible" alt="Principal active" />::<img src="env/grafics/PrincipalOffline.gif" width="11" height="11" title="Type: Principal | Contact: offline | Seed download: ?" alt="Principal offline" />#(/direct)#</a>#(/type)##(acceptcrawl)#<img src="env/grafics/CrawlNo.gif" width="11" height="11" title="Accept Crawl: no" alt="no crawl" />::<img src="env/grafics/CrawlYes.gif" width="11" height="11" title="Accept Crawl: yes" alt="crawl possible" />::<img src="env/grafics/CrawlYesOffline.gif" width="11" height="11" title="Accept Crawl: yes" alt="crawl possible" />#(/acceptcrawl)##(dhtreceive)#<img src="env/grafics/DHTReceiveNo.gif" width="11" height="11" title="DHT Receive: no; #[peertags]#" alt="no DHT receive" />::<img src="env/grafics/DHTReceiveYes.gif" width="11" height="11" title="DHT Receive: yes" alt="DHT receive enabled" />::<img src="env/grafics/DHTReceiveYesOffline.gif" width="11" height="11" title="DHT Receive: yes" alt="DHT receive enabled" />#(/dhtreceive)##(nodestate)#<img src="env/grafics/RootStateNo.gif" width="11" height="11" title="Not a Node Candidate" alt="no node candidate" />::<a href="http://#[ip]#:#[port]#/Network.html?page=1"><img src="env/grafics/RootStateYes.gif" width="11" height="11" title="Node Candidate" alt="node candidate" /></a>#(/nodestate)#</td>
         <td align="right">#[version]#</td>

htroot/PerformanceQueues_p.html

@@ -126,7 +126,7 @@
 	  </fieldset>
   </form>
   
-  <form action="PerformanceQueues_p.html" method="post" enctype="multipart/form-data" accept-charset="UTF-8">
+  <form action="PerformanceQueues_p.html" method="post" enctype="multipart/form-data" accept-charset="UTF-8" id="ThreadPoolSettings">
 	  <fieldset><legend>Thread Pool Settings:</legend>
 	    <table border="0">
 	      <tr class="TableHeader" valign="bottom">

htroot/Status_p.inc

@@ -78,7 +78,7 @@
     <dd>Proxy: #[trafficProxy]#<br/>Crawler: #[trafficCrawler]#</dd>
     
     <dt><a href="Connections_p.html">Incoming Connections</a></dt>
-    <dd>Active: #[connectionsActive]# | Max: #[connectionsMax]#</dd>
+    <dd>Active: #[connectionsActive]# | Max: <a href="PerformanceQueues_p.html#ThreadPoolSettings">#[connectionsMax]#</a></dd>
     
     <dt><a href="Crawler_p.html">Queues</a></dt>
     <dd>
@@ -86,7 +86,7 @@
     <table>
       <tr>
         <td><div class="ProgressBar"><div class="ProgressBarFill" style="width:#[loaderQueuePercent]#%;" ></div></div></td>
-        <td><div class="ProgressBarCaption">#[loaderQueueSize]#&nbsp;|&nbsp;#[loaderQueueMax]#</div></td>
+        <td><div class="ProgressBarCaption">#[loaderQueueSize]#&nbsp;|&nbsp;<a href="PerformanceQueues_p.html#ThreadPoolSettings">#[loaderQueueMax]#</a></div></td>
       </tr>
       <tr>
         <td><a href="IndexCreateQueues_p.html?stack=LOCAL">Local Crawl</a></td>

htroot/ViewFile.html

@@ -1,6 +1,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "DTD/xhtml1-transitional.dtd">
 <!-- This page is only XHTML 1.0 Transitional and not Strict because iframes are in use -->
 <html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
   <script type="text/javascript">
 //<![CDATA[
 function xmlhttpPost() {
@@ -23,7 +24,7 @@ function search(query) {
         if (self.xmlHttpReq.readyState == 4) {
             updatepage(self.xmlHttpReq.responseText);
         }
-    }
+    };
     self.xmlHttpReq.send(null);
 }
 
@@ -33,9 +34,6 @@ function updatepage(str) {
   var rsp = eval("("+str+")");
   var firstChannel = rsp.channels[0];
   var totalResults = firstChannel.totalResults.replace(/[,.]/,"");
-  var startIndex = firstChannel.startIndex;
-  var itemsPerPage = firstChannel.itemsPerPage;
-  var navigation = firstChannel.navigation;
   
   var html = "";
   
@@ -54,7 +52,6 @@ function updatepage(str) {
 }
 //]]>
 </script>
-  <head>
     <title>YaCy '#[clientname]#': View URL Content</title>
     #%env/templates/metas.template%#
   <script type="text/javascript" src="js/highslide/highslide.js"></script>
@@ -71,7 +68,7 @@ function updatepage(str) {
 </script>
 
 <div id="api">
-<a href="http://localhost:8090/api/getpageinfo_p.xml?actions=title,robots&url=#[url]#" id="apilink">
+<a href="api/getpageinfo_p.xml?actions=title,robots&url=#[url]#" id="apilink">
 <img src="env/grafics/api.png" width="60" height="40" alt="API"/>
 </a>
 <span>See the page info about the url.</span>

htroot/ViewFile.java

@@ -157,6 +157,8 @@ public class ViewFile {
             //urlEntry.wordCount();
             size = urlEntry.size();
             pre = urlEntry.flags().get(Condenser.flag_cat_indexof);
+            prop.put("moar", 1);
+            prop.putHTML("moar_search", post.get("search",""));
         }
 
         prop.put("error_inurldb", urlEntry == null ? 0 : 1);
@@ -168,8 +170,6 @@ public class ViewFile {
             return prop;
         }
         prop.put("url", url.toNormalform(true));
-        prop.put("moar", 1);
-        prop.putHTML("moar_search", post.get("search",""));
 
         // loading the resource content as byte array
         prop.put("error_incache", Cache.has(url.hash()) ? 1 : 0);

pom.xml

@@ -4,7 +4,7 @@
 
     <groupId>net.yacy</groupId>
     <artifactId>yacycore</artifactId>
-    <version>1.73</version>
+    <version>1.81</version>
     <packaging>jar</packaging>
     <description>YaCy - a Peer to Peer Web Search Engine</description>
     <name>YaCy</name>