if a network configuration is choosed which does not allow DHT and no

P2P communication is in robinson mode) then some menu entries are
disabled which have no use in this mode.
pull/1/head
Michael Peter Christen 12 years ago
parent 2d9e577ad0
commit 3d3d654e88

@ -38,7 +38,7 @@
<li class="menugroup" id="menugroupMonitoring"> <li class="menugroup" id="menugroupMonitoring">
<h3>Monitoring</h3> <h3>Monitoring</h3>
<ul class="menu"> <ul class="menu">
<li><a href="/Network.html" accesskey="w" class="MenuItemLink">YaCy Network</a></li> #(p2p)#::<li><a href="/Network.html" accesskey="w" class="MenuItemLink">YaCy Network</a></li>#(/p2p)#
<li><a href="/WatchWebStructure_p.html?host=auto&amp;depth=3&amp;time=1000" class="MenuItemLink lock">Web Visualization</a></li> <li><a href="/WatchWebStructure_p.html?host=auto&amp;depth=3&amp;time=1000" class="MenuItemLink lock">Web Visualization</a></li>
<li><a href="/AccessGrid_p.html" class="MenuItemLink lock">Network Access</a></li> <li><a href="/AccessGrid_p.html" class="MenuItemLink lock">Network Access</a></li>
<li><a href="/ViewLog_p.html" class="MenuItemLink lock">Computation</a></li> <li><a href="/ViewLog_p.html" class="MenuItemLink lock">Computation</a></li>

@ -17,7 +17,7 @@
<li><a href="/AccessTracker_p.html?page=3" class="MenuItemLink lock">Host Tracker</a></li> <li><a href="/AccessTracker_p.html?page=3" class="MenuItemLink lock">Host Tracker</a></li>
</ul> </ul>
</div> </div>
#(p2p)#::
<div class="SubMenugroup"> <div class="SubMenugroup">
<h3>Remote Search</h3> <h3>Remote Search</h3>
<ul class="SubMenu"> <ul class="SubMenu">
@ -25,4 +25,5 @@
<li><a href="/AccessTracker_p.html?page=5" class="MenuItemLink lock">Host Tracker</a></li> <li><a href="/AccessTracker_p.html?page=5" class="MenuItemLink lock">Host Tracker</a></li>
</ul> </ul>
</div> </div>
#(/p2p)#
</div> </div>

@ -11,6 +11,7 @@
<li><a href="/PerformanceSearch_p.html" class="MenuItemLink">Search Sequence</a></li> <li><a href="/PerformanceSearch_p.html" class="MenuItemLink">Search Sequence</a></li>
</ul> </ul>
</div> </div>
#(p2p)#::
<div class="SubMenugroup"> <div class="SubMenugroup">
<h3>Messages</h3> <h3>Messages</h3>
<ul class="SubMenu"> <ul class="SubMenu">
@ -21,4 +22,5 @@
<li><a href="/News.html?page=4" class="MenuItemLink">Published&nbsp;News</a></li> <li><a href="/News.html?page=4" class="MenuItemLink">Published&nbsp;News</a></li>
</ul> </ul>
</div> </div>
#(/p2p)#
</div> </div>

@ -15,8 +15,8 @@
<h3>Queues</h3> <h3>Queues</h3>
<ul class="SubMenu"> <ul class="SubMenu">
<li><a href="/IndexCreateQueues_p.html?stack=LOCAL" class="MenuItemLink lock">Local</a></li> <li><a href="/IndexCreateQueues_p.html?stack=LOCAL" class="MenuItemLink lock">Local</a></li>
<li><a href="/IndexCreateQueues_p.html?stack=GLOBAL" class="MenuItemLink lock">Global</a></li> #(p2p)#::<li><a href="/IndexCreateQueues_p.html?stack=GLOBAL" class="MenuItemLink lock">Global</a></li>#(/p2p)#
<li><a href="/IndexCreateQueues_p.html?stack=REMOTE" class="MenuItemLink lock">Remote</a></li> #(p2p)#::<li><a href="/IndexCreateQueues_p.html?stack=REMOTE" class="MenuItemLink lock">Remote</a></li>#(/p2p)#
<li><a href="/IndexCreateQueues_p.html?stack=NOLOAD" class="MenuItemLink lock">No-Load</a></li> <li><a href="/IndexCreateQueues_p.html?stack=NOLOAD" class="MenuItemLink lock">No-Load</a></li>
</ul> </ul>
</div> </div>
@ -39,12 +39,12 @@
<div class="SubMenugroup"> <div class="SubMenugroup">
<ul class="SubMenu"> <ul class="SubMenu">
<li><a href="/CrawlResults.html" class="MenuItemLink">Overview</a></li> <li><a href="/CrawlResults.html" class="MenuItemLink">Overview</a></li>
<li><a href="/CrawlResults.html?process=1" class="MenuItemLink lock">(1) Receipts</a></li> #(p2p)#::<li><a href="/CrawlResults.html?process=1" class="MenuItemLink lock">(1) Receipts</a></li>#(/p2p)#
<li><a href="/CrawlResults.html?process=2" class="MenuItemLink lock">(2) Queries</a></li> <li><a href="/CrawlResults.html?process=2" class="MenuItemLink lock">(2) Queries</a></li>
<li><a href="/CrawlResults.html?process=3" class="MenuItemLink lock">(3) DHT Transfer</a></li> #(p2p)#::<li><a href="/CrawlResults.html?process=3" class="MenuItemLink lock">(3) DHT Transfer</a></li>#(/p2p)#
<li><a href="/CrawlResults.html?process=4" class="MenuItemLink lock">(4) Proxy Use</a></li> <li><a href="/CrawlResults.html?process=4" class="MenuItemLink lock">(4) Proxy Use</a></li>
<li><a href="/CrawlResults.html?process=5" class="MenuItemLink lock">(5) Local Crawling</a></li> <li><a href="/CrawlResults.html?process=5" class="MenuItemLink lock">(5) Local Crawling</a></li>
<li><a href="/CrawlResults.html?process=6" class="MenuItemLink">(6) Global Crawling</a></li> #(p2p)#::<li><a href="/CrawlResults.html?process=6" class="MenuItemLink">(6) Global Crawling</a></li>#(/p2p)#
<li><a href="/CrawlResults.html?process=7" class="MenuItemLink lock">(7) Surrogate Import</a></li> <li><a href="/CrawlResults.html?process=7" class="MenuItemLink lock">(7) Surrogate Import</a></li>
</ul> </ul>
</div> </div>

@ -2,7 +2,7 @@
<h3>Index Administration</h3> <h3>Index Administration</h3>
<ul class="SubMenu"> <ul class="SubMenu">
<li><a href="/IndexControlURLs_p.html" class="MenuItemLink lock">URL References Database</a></li> <li><a href="/IndexControlURLs_p.html" class="MenuItemLink lock">URL References Database</a></li>
<li><a href="/IndexControlRWIs_p.html" class="MenuItemLink lock">Reverse Word Index Administration</a></li> #(p2p)#::<li><a href="/IndexControlRWIs_p.html" class="MenuItemLink lock">Reverse Word Index Administration</a></li>#(/p2p)#
<!--<li><a href="/IndexControlCleaner_p.html" class="MenuItemLink lock">Index Cleaner</a></li>--> <!--<li><a href="/IndexControlCleaner_p.html" class="MenuItemLink lock">Index Cleaner</a></li>-->
<li><a href="/ViewFile.html?display=1" class="MenuItemLink">URL Viewer</a></li> <li><a href="/ViewFile.html?display=1" class="MenuItemLink">URL Viewer</a></li>
<li><a href="/IndexFederated_p.html" class="MenuItemLink lock">Federated Index</a></li> <li><a href="/IndexFederated_p.html" class="MenuItemLink lock">Federated Index</a></li>

@ -995,6 +995,7 @@ public final class HTTPDFileHandler {
final Seed myPeer = sb.peers.mySeed(); final Seed myPeer = sb.peers.mySeed();
templatePatterns.put("newpeer", myPeer.getAge() >= 1 ? 0 : 1); templatePatterns.put("newpeer", myPeer.getAge() >= 1 ? 0 : 1);
templatePatterns.putHTML("newpeer_peerhash", myPeer.hash); templatePatterns.putHTML("newpeer_peerhash", myPeer.hash);
templatePatterns.put("p2p", sb.getConfigBool(SwitchboardConstants.DHT_ENABLED, true) || !sb.isRobinsonMode() ? 1 : 0);
//System.out.println("respond props: " + ((tp == null) ? "null" : tp.toString())); // debug //System.out.println("respond props: " + ((tp == null) ? "null" : tp.toString())); // debug
nocache = true; nocache = true;
} }

Loading…
Cancel
Save