summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--htroot/ConfigAppearance_p.html2
-rw-r--r--htroot/ConfigLanguage_p.html2
-rw-r--r--htroot/ConfigLiveSearch.html2
-rw-r--r--htroot/ConfigPortal.html2
-rw-r--r--htroot/ConfigProfile_p.html2
-rw-r--r--htroot/ConfigSearchBox.html2
-rw-r--r--htroot/CrawlStartExpert_p.html10
-rw-r--r--htroot/Crawler_p.java2
-rw-r--r--htroot/IndexCreateQueues_p.html6
-rw-r--r--htroot/Ranking_p.html2
-rw-r--r--htroot/Surftips.html6
-rw-r--r--htroot/Table_API_p.html2
-rw-r--r--htroot/env/templates/header.template25
-rw-r--r--htroot/env/templates/simpleheader.template3
-rw-r--r--htroot/env/templates/submenuComputation.template15
-rw-r--r--htroot/env/templates/submenuIndexControl.template4
-rw-r--r--htroot/env/templates/submenuPortalIntegration.template12
-rw-r--r--htroot/env/templates/submenuSearchIntegration.template7
18 files changed, 55 insertions, 51 deletions
diff --git a/htroot/ConfigAppearance_p.html b/htroot/ConfigAppearance_p.html
index d8deb9632..7248911a0 100644
--- a/htroot/ConfigAppearance_p.html
+++ b/htroot/ConfigAppearance_p.html
@@ -7,7 +7,7 @@
</head>
<body id="ConfigSkins">
#%env/templates/header.template%#
- #%env/templates/submenuPortalIntegration.template%#
+ #%env/templates/submenuSearchConfiguration.template%#
<script type="text/javascript" src="/yacy/ui/js/jquery.colorpicker.js"></script>
<script type="text/javascript">
diff --git a/htroot/ConfigLanguage_p.html b/htroot/ConfigLanguage_p.html
index 6b16fc2d6..9493dcb07 100644
--- a/htroot/ConfigLanguage_p.html
+++ b/htroot/ConfigLanguage_p.html
@@ -6,7 +6,7 @@
</head>
<body id="ConfigLanguage">
#%env/templates/header.template%#
- #%env/templates/submenuPortalIntegration.template%#
+ #%env/templates/submenuSearchConfiguration.template%#
<h2>Language selection</h2>
<p>
You can change the language of the YaCy-webinterface with translation files.
diff --git a/htroot/ConfigLiveSearch.html b/htroot/ConfigLiveSearch.html
index 7beb093d9..a618b53a5 100644
--- a/htroot/ConfigLiveSearch.html
+++ b/htroot/ConfigLiveSearch.html
@@ -7,7 +7,7 @@
</head>
<body id="ConfigSkins">
#%env/templates/header.template%#
- #%env/templates/submenuPortalIntegration.template%#
+ #%env/templates/submenuSearchIntegration.template%#
<h2>Integration of Live Search with YaCy Search Widget</h2>
<p>
A 'Live-Search' input field that reacts as search-as-you-type in a pop-up window can easily be integrated in any web page.
diff --git a/htroot/ConfigPortal.html b/htroot/ConfigPortal.html
index 711fbd78d..ce2355111 100644
--- a/htroot/ConfigPortal.html
+++ b/htroot/ConfigPortal.html
@@ -7,7 +7,7 @@
</head>
<body id="ConfigSkins">
#%env/templates/header.template%#
- #%env/templates/submenuPortalIntegration.template%#
+ #%env/templates/submenuSearchConfiguration.template%#
<h2>Integration of a Search Portal</h2>
<p>
If you like to integrate YaCy as portal for your web pages, you may want to change icons and messages on the search page.
diff --git a/htroot/ConfigProfile_p.html b/htroot/ConfigProfile_p.html
index 9ab7b7a62..71a7bb558 100644
--- a/htroot/ConfigProfile_p.html
+++ b/htroot/ConfigProfile_p.html
@@ -6,7 +6,7 @@
</head>
<body id="ConfigProfile">
#%env/templates/header.template%#
- #%env/templates/submenuPortalIntegration.template%#
+ #%env/templates/submenuSearchConfiguration.template%#
<h2>Your Personal Profile</h2>
<p>
You can create a personal profile here, which can be seen by other YaCy-members
diff --git a/htroot/ConfigSearchBox.html b/htroot/ConfigSearchBox.html
index 4ecb4ea5f..97687b9f5 100644
--- a/htroot/ConfigSearchBox.html
+++ b/htroot/ConfigSearchBox.html
@@ -6,7 +6,7 @@
</head>
<body id="ConfigSkins">
#%env/templates/header.template%#
- #%env/templates/submenuPortalIntegration.template%#
+ #%env/templates/submenuSearchIntegration.template%#
<h2>Integration of a Search Box</h2>
<p>
We give information how to integrate a search box on any web page that
diff --git a/htroot/CrawlStartExpert_p.html b/htroot/CrawlStartExpert_p.html
index 5a703e168..ce6d63d7f 100644
--- a/htroot/CrawlStartExpert_p.html
+++ b/htroot/CrawlStartExpert_p.html
@@ -18,7 +18,10 @@
</head>
<body id="IndexCreate">
-<div id="api"></div>
+<div id="api">
+<a href="http://www.yacy-websuche.de/wiki/index.php/Dev:API#Managing_crawl_jobs" id="apilink"><img src="/env/grafics/api.png" width="60" height="40" alt="API"/></a>
+<span>Click on this API button to see a documentation of the POST request parameter for crawl starts.</span>
+</div>
#%env/templates/header.template%#
#%env/templates/submenuIndexCreate.template%#
@@ -26,7 +29,10 @@
<p id="startCrawling">
<strong>Start Crawling Job:</strong>&nbsp;
- You can define URLs as start points for Web page crawling and start crawling here. "Crawling" means that YaCy will download the given website, extract all links in it and then download the content behind these links. This is repeated as long as specified under "Crawling Depth".
+ You can define URLs as start points for Web page crawling and start crawling here.
+ "Crawling" means that YaCy will download the given website, extract all links in it and then download the content behind these links.
+ This is repeated as long as specified under "Crawling Depth".
+ A crawl can also be started using wget and the <a href="http://www.yacy-websuche.de/wiki/index.php/Dev:API#Managing_crawl_jobs">post arguments</a> for this web page.
</p>
<form id="Crawler" action="Crawler_p.html" method="post" enctype="multipart/form-data" accept-charset="UTF-8">
diff --git a/htroot/Crawler_p.java b/htroot/Crawler_p.java
index 454eafd72..5301cbeae 100644
--- a/htroot/Crawler_p.java
+++ b/htroot/Crawler_p.java
@@ -150,7 +150,7 @@ public class Crawler_p {
if (newcrawlingMustMatch.length() < 2) newcrawlingMustMatch = CrawlProfile.MATCH_ALL_STRING; // avoid that all urls are filtered out if bad value was submitted
final boolean fullDomain = "domain".equals(post.get("range", "wide")); // special property in simple crawl start
final boolean subPath = "subpath".equals(post.get("range", "wide")); // special property in simple crawl start
- final boolean deleteold = (fullDomain || subPath) && post.getBoolean("deleteold");
+ final boolean deleteold = (fullDomain || subPath || !CrawlProfile.MATCH_ALL_STRING.equals(newcrawlingMustMatch)) && post.getBoolean("deleteold");
String crawlingStart0 = post.get("crawlingURL","").trim(); // the crawljob start url
String[] rootURLs0 = crawlingStart0.indexOf('\n') > 0 || crawlingStart0.indexOf('\r') > 0 ? crawlingStart0.split("[\\r\\n]+") : crawlingStart0.split(Pattern.quote("|"));
diff --git a/htroot/IndexCreateQueues_p.html b/htroot/IndexCreateQueues_p.html
index 9f76e9547..801250192 100644
--- a/htroot/IndexCreateQueues_p.html
+++ b/htroot/IndexCreateQueues_p.html
@@ -5,6 +5,12 @@
#%env/templates/metas.template%#
</head>
<body id="IndexCreateQueues">
+
+<div id="api">
+<a href="/api/latency_p.xml" id="apilink"><img src="/env/grafics/api.png" width="60" height="40" alt="API"/></a>
+<span>Click on this API button to see an XML with information about the crawler latency and other statistics.</span>
+</div>
+
<div id="fullcontent">
#(embed)#
#%env/templates/header.template%#
diff --git a/htroot/Ranking_p.html b/htroot/Ranking_p.html
index f506672fc..65db74bc3 100644
--- a/htroot/Ranking_p.html
+++ b/htroot/Ranking_p.html
@@ -26,7 +26,7 @@
</head>
<body id="Ranking_p">
#%env/templates/header.template%#
- #%env/templates/submenuPortalIntegration.template%#
+ #%env/templates/submenuSearchConfiguration.template%#
<h2>Ranking Configuration</h2>
<p>The document ranking influences the order of the search result entities.
A ranking is computed using a number of attributes from the documents that match with the search word.
diff --git a/htroot/Surftips.html b/htroot/Surftips.html
index 29f27d593..2570b7128 100644
--- a/htroot/Surftips.html
+++ b/htroot/Surftips.html
@@ -17,11 +17,7 @@
<script type="text/javascript" src="/js/yacysearch.js"></script>
</head>
<body id="Surftips">
- #(display)#
- #%env/templates/simpleheader.template%#
- ::
- #%env/templates/header.template%#
- #(/display)#
+ #(submenu)#::#%env/templates/submenuComputation.template%##(/submenu)#
<h2 class="yacy">Surftips</h2>
diff --git a/htroot/Table_API_p.html b/htroot/Table_API_p.html
index 704832daf..855573ead 100644
--- a/htroot/Table_API_p.html
+++ b/htroot/Table_API_p.html
@@ -40,7 +40,7 @@ To see a list of all APIs, please visit the <a href="http://www.yacy-websuche.de
<div id="fullcontent">
#(inline)##%env/templates/header.template%#
- <h2>Steering of API Actions</h2>
+ <h2>Process Scheduler</h2>
<p>This table shows actions that had been issued on the YaCy interface
to change the configuration or to request crawl actions.
These recorded actions can be used to repeat specific actions and to send them
diff --git a/htroot/env/templates/header.template b/htroot/env/templates/header.template
index 4c51b3637..020c4cedd 100644
--- a/htroot/env/templates/header.template
+++ b/htroot/env/templates/header.template
@@ -15,15 +15,12 @@
<li><a href="/gsa/search?q=www&size=3" class="MenuItemLink">Embedded GSA API</a></li>
<!--<li><a href="/yacy/ui/" accesskey="s" class="MenuItemLink">Rich Client Search</a></li>-->
<li><a href="/compare_yacy.html?display=1" class="MenuItemLink">Compare Search</a></li>
- <li><a href="/ConfigPortal.html" class="MenuItemLink">Search Integration</a></li>
</ul>
- </li>
<li class="menugroup" id="menugroupGlobalIndex">
- <h3>Browse</h3>
+ <h3>Search Design</h3>
<ul class="menu">
- <li><a href="/YMarks.html" class="MenuItemLink">Bookmarks</a></li>
- <li><a href="/Surftips.html?display=1" class="MenuItemLink">Surftips</a></li>
- <li><a href="/Wiki.html?display=1" class="MenuItemLink">Local Peer Wiki</a></li>
+ <li><a href="/ConfigPortal.html" class="MenuItemLink">Integrated Search Configuration</a></li>
+ <li><a href="/ConfigLiveSearch.html" class="MenuItemLink">Search Integration into External Sites</a></li>
</ul>
</li>
<li class="menugroup" id="menugroupCrawlerControl">
@@ -34,6 +31,7 @@
<li><a href="/IndexControlURLs_p.html" class="MenuItemLink lock">Index Administration</a></li>
<li><a href="/Blacklist_p.html" class="MenuItemLink lock">Filter &amp; Blacklists</a></li>
<li><a href="/Vocabulary_p.html" class="MenuItemLink lock">Content Semantic</a></li>
+ <li><a href="/Table_API_p.html" class="MenuItemLink lock">Process Scheduler</a></li>
</ul>
</li>
<li class="menugroup" id="menugroupMonitoring">
@@ -44,27 +42,26 @@
<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="/terminal_p.html" accesskey="t" class="MenuItemLink lock">Terminal</a></li>
+ <li><a href="/YMarks.html" class="MenuItemLink">Bookmarks</a></li>
</ul>
</li>
<li class="menugroup" id="menugroupPeerControl">
<h3>Peer Control</h3>
<ul class="menu">
<li><a href="/Status.html?noforward=" class="MenuItemLink">Admin Console</a></li>
- <li><a href="/Table_API_p.html" class="MenuItemLink lock">API Action Steering</a></li>
- <li><a href="/Help.html" class="MenuItemLink">Tutorial</a></li>
<li><a href="/Steering.html?restart=" class="MenuItemLink lock" onclick="return confirm('Confirm Restart')">Re-Start</a></li>
<li><a href="/Steering.html?shutdown=" class="MenuItemLink lock" onclick="return confirm('Confirm Shutdown')">Shutdown</a></li>
</ul>
</li>
<li class="menugroup" id="menugroupTheProjekt">
- <h3>The Project</h3>
+ <h3>The YaCy Project</h3>
<ul class="menu">
<li><a href="http://www.yacy.net/" class="MenuItemLink">Project Home</a></li>
- <li><a href="http://forum.yacy.de" class="MenuItemLink">Deutsches Forum</a></li>
- <li><a href="http://www.yacy-forum.org" class="MenuItemLink">English Forum</a></li>
- <li><a href="http://wiki.yacy.de" class="MenuItemLink">YaCy Project Wiki</a></li>
- <li><a href="https://gitorious.org/yacy/rc1/commits/master" class="MenuItemLink">Development Change Log</a></li>
- <li><a href="http://bugs.yacy.net" class="MenuItemLink">YaCy Bugtracker</a></li>
+ <li><a href="/Help.html" class="MenuItemLink">Tutorials</a></li>
+ <li><a href="http://forum.yacy.de" class="MenuItemLink">Forum/Discussion</a></li>
+ <li><a href="http://wiki.yacy.de" class="MenuItemLink">Project Wiki</a></li>
+ <li><a href="https://gitorious.org/yacy/rc1/commits/master" class="MenuItemLink">Git Repository</a></li>
+ <li><a href="http://bugs.yacy.net" class="MenuItemLink">Bugtracker</a></li>
<li><a href="#(newpeer)#http://www.yacystats.de/peer/#[peerhash]#::http://www.yacystats.de#(/newpeer)#" class="MenuItemLink">#(newpeer)#Peer Statistics::YaCy Statistics#(/newpeer)#</a></li>
</ul>
</li>
diff --git a/htroot/env/templates/simpleheader.template b/htroot/env/templates/simpleheader.template
index be6ba2a5b..ebca85ce8 100644
--- a/htroot/env/templates/simpleheader.template
+++ b/htroot/env/templates/simpleheader.template
@@ -4,8 +4,7 @@
<li style="width:15%;"><a href="/index.html" onclick="this.href='/index.html?handover='+document.searchform.search.value" class="MenuItemLink">Web Search</a></li>
<li style="width:15%;"><a href="/yacyinteractive.html" onclick="this.href='/yacyinteractive.html?handover='+document.searchform.search.value" class="MenuItemLink">File Search</a></li>
<li style="width:15%;"><a href="/HostBrowser.html?hosts=" class="MenuItemLink">HostBrowser</a></li>
-<li style="width:15%;"><a href="/Network.html?menu=simple" class="MenuItemLink">Search Network</a></li>
-<li style="width:15%;"><a href="/ViewProfile.html?hash=localhash" class="MenuItemLink">Peer Owner Profile</a></li>
+<li style="width:15%;"><a href="/ViewProfile.html?hash=localhash" class="MenuItemLink">About Us</a></li>
<li style="width:9%;"><a href="http://www.yacy-websearch.net/wiki/" class="MenuItemLink">Help / YaCy Wiki</a></li>
</ul>
</div>
diff --git a/htroot/env/templates/submenuComputation.template b/htroot/env/templates/submenuComputation.template
index 97bc7fa88..0ed024357 100644
--- a/htroot/env/templates/submenuComputation.template
+++ b/htroot/env/templates/submenuComputation.template
@@ -6,12 +6,11 @@
<h3>Processes</h3>
<ul class="SubMenu">
<li><a href="/ViewLog_p.html" class="MenuItemLink lock">Server Log</a></li>
- <li><a href="/PerformanceConcurrency_p.html" class="MenuItemLink">Concurrent Indexing</a></li>
- <li><a href="/PerformanceMemory_p.html" class="MenuItemLink">Memory Usage</a></li>
- <li><a href="/PerformanceSearch_p.html" class="MenuItemLink">Search Sequence</a></li>
+ <li><a href="/PerformanceConcurrency_p.html" class="MenuItemLink lock">Concurrent Indexing</a></li>
+ <li><a href="/PerformanceMemory_p.html" class="MenuItemLink lock">Memory Usage</a></li>
+ <li><a href="/PerformanceSearch_p.html" class="MenuItemLink lock">Search Sequence</a></li>
</ul>
</div>
- #(p2p)#::
<div class="SubMenugroup">
<h3>Messages</h3>
<ul class="SubMenu">
@@ -22,5 +21,11 @@
<li><a href="/News.html?page=4" class="MenuItemLink">Published&nbsp;News</a></li>
</ul>
</div>
- #(/p2p)#
+ <div class="SubMenugroup">
+ <h3>Community Data</h3>
+ <ul class="SubMenu">
+ <li><a href="/Surftips.html" class="MenuItemLink">Surftips</a></li>
+ <li><a href="/Wiki.html?display=1" class="MenuItemLink">Local Peer Wiki</a></li>
+ </ul>
+ </div>
</div>
diff --git a/htroot/env/templates/submenuIndexControl.template b/htroot/env/templates/submenuIndexControl.template
index 4276bd117..2e72dc8b6 100644
--- a/htroot/env/templates/submenuIndexControl.template
+++ b/htroot/env/templates/submenuIndexControl.template
@@ -1,10 +1,10 @@
<div class="SubMenu">
<h3>Index Administration</h3>
<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">Database Administration</a></li>
+ <li><a href="/IndexFederated_p.html" class="MenuItemLink lock">Federated Solr Index</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="/ViewFile.html?display=1" class="MenuItemLink">URL Viewer</a></li>
- <li><a href="/IndexFederated_p.html" class="MenuItemLink lock">Federated Index</a></li>
</ul>
</div>
diff --git a/htroot/env/templates/submenuPortalIntegration.template b/htroot/env/templates/submenuPortalIntegration.template
deleted file mode 100644
index 48d9fd19a..000000000
--- a/htroot/env/templates/submenuPortalIntegration.template
+++ /dev/null
@@ -1,12 +0,0 @@
-<div class="SubMenu">
- <h3>Search Portal Integration</h3>
- <ul class="SubMenu">
- <li><a href="/ConfigPortal.html" class="MenuItemLink">Generic Search Portal</a></li>
- <li><a href="/ConfigLiveSearch.html" class="MenuItemLink">Live Search Anywhere</a></li>
- <li><a href="/ConfigSearchBox.html" class="MenuItemLink">Search Box Anywhere</a></li>
- <li><a href="/ConfigAppearance_p.html" class="MenuItemLink lock">Appearance</a></li>
- <li><a href="/ConfigProfile_p.html" class="MenuItemLink lock">User Profile</a></li>
- <li><a href="/ConfigLanguage_p.html" class="MenuItemLink lock">Language</a></li>
- <li><a href="/Ranking_p.html" class="MenuItemLink lock">Ranking Config</a></li>
- </ul>
-</div> \ No newline at end of file
diff --git a/htroot/env/templates/submenuSearchIntegration.template b/htroot/env/templates/submenuSearchIntegration.template
new file mode 100644
index 000000000..4a5397425
--- /dev/null
+++ b/htroot/env/templates/submenuSearchIntegration.template
@@ -0,0 +1,7 @@
+<div class="SubMenu">
+ <h3>Search Integration into External Sites</h3>
+ <ul class="SubMenu">
+ <li><a href="/ConfigLiveSearch.html" class="MenuItemLink">Live Search Anywhere</a></li>
+ <li><a href="/ConfigSearchBox.html" class="MenuItemLink">Search Box Anywhere</a></li>
+ </ul>
+</div> \ No newline at end of file
generated by cgit v1.2.3 (git 2.46.0) at 2026-08-08 10:35:55 +0000