boxtec
/
yacy_search_server
mirror of https://github.com/yacy/yacy_search_server
4
1
Fork 0
Code Issues Projects Releases Wiki Activity

- enhanced index create menu structure

Browse Source 
- clear search log caches each time a search is done

git-svn-id: https://svn.berlios.de/svnroot/repos/yacy/trunk@7142 6c8d7289-2bf4-0310-a012-ef5d649a1542
pull/1/head
orbiter 14 years ago
parent fc924f024e
commit 906c572621
9 changed files with 44 additions and 20 deletions
Show Stats Download Patch File Download Diff File

2
htroot/ContentIntegrationPHPBB3_p.html
Unescape View File

@ -6,7 +6,7 @@
</head>
<body id="ContentIntegrationPHPBB3">
#%env/templates/header.template%#
#%env/templates/submenuContentIntegration.template%#
#%env/templates/submenuIndexCreate.template%#
<h2>Content Integration: Retrieval from phpBB3 Databases</h2>
<p>
It is possible to extract texts directly from mySQL and postgreSQL databases.

2
htroot/IndexImportOAIPMH_p.html
Unescape View File

@ -7,7 +7,7 @@
</head>
<body id="IndexImportOAIPMH">
#%env/templates/header.template%#
#%env/templates/submenuContentIntegration.template%#
#%env/templates/submenuIndexCreate.template%#
<h2>OAI-PMH Import</h2>
<p>Results from the import can be monitored in the <a href="/CrawlResults.html?process=7">indexing results for surrogates</a></p>

2
htroot/IndexImportWikimedia_p.html
Unescape View File

@ -7,7 +7,7 @@
</head>
<body id="IndexImportWikimedia">
#%env/templates/header.template%#
#%env/templates/submenuContentIntegration.template%#
#%env/templates/submenuIndexCreate.template%#
<h2>Wikimedia Dump Import</h2>
#(import)#

1
htroot/env/templates/header.template vendored
Unescape View File

@ -61,7 +61,6 @@
<li><a href="/CrawlStart_p.html" class="MenuItemLink lock">Index Creation</a></li>
<li><a href="/Crawler_p.html" class="MenuItemLink lock">Crawler Monitor</a></li>
<li><a href="/CrawlResults.html?process=5&amp;autoforward=" class="MenuItemLink">Crawl Results</a></li>
<li><a href="/ContentIntegrationPHPBB3_p.html" class="MenuItemLink lock">Content Import</a></li>
<li><a href="/IndexControlRWIs_p.html" class="MenuItemLink lock">Index Administration</a></li>
<li><a href="/Blacklist_p.html" class="MenuItemLink lock">Filter &amp; Blacklists</a></li>
</ul>

8
htroot/env/templates/submenuContentIntegration.template vendored
Unescape View File

@ -1,8 +0,0 @@
<div class="SubMenu">
<h3>External Content Integration</h3>
<ul class="SubMenu">
<li><a href="/ContentIntegrationPHPBB3_p.html" class="MenuItemLink lock">Import phpBB3 forum</a></li>
<li><a href="/IndexImportWikimedia_p.html" class="MenuItemLink lock">Import Wikimedia dumps</a></li>
<li><a href="/IndexImportOAIPMH_p.html" class="MenuItemLink lock">Import OAI-PMH Sources</a></li>
</ul>
</div>

40
htroot/env/templates/submenuIndexCreate.template vendored
Unescape View File

@ -1,10 +1,36 @@
<div class="SubMenu">
<h3>Index Creation</h3>
<ul class="SubMenu">
<li><a href="/CrawlStart_p.html" class="MenuItemLink lock">Crawl Start (Advanced)</a></li>
<li><a href="/Load_MediawikiWiki.html" class="MenuItemLink">Indexing of Media Wikis</a></li>
<li><a href="/Load_PHPBB3.html" class="MenuItemLink">Indexing of phpBB3 Forums</a></li>
<li><a href="/Load_RSS_p.html" class="MenuItemLink lock">Indexing of RSS Feeds</a></li>
<li><a href="/ProxyIndexingMonitor_p.html" class="MenuItemLink lock">Scraping Proxy Configuration</a></li>
</ul>
</div>
<div class="SubMenu">
<div class="SubMenugroup">
<h3>Crawler/Spider</h3>
<ul class="SubMenu">
<li><a href="/CrawlStart_p.html" class="MenuItemLink lock">Web/FTP Crawl Start<br/>(Advanced)</a></li>
<li><a href="/Load_MediawikiWiki.html" class="MenuItemLink">Crawling of<br/>Media Wikis</a></li>
<li><a href="/Load_PHPBB3.html" class="MenuItemLink">Crawling of<br/>phpBB3 Forums</a></li>
</ul>
</div>
<div class="SubMenugroup">
<h3>Database Reader</h3>
<ul class="SubMenu">
<li><a href="/ContentIntegrationPHPBB3_p.html" class="MenuItemLink lock">Database Reader for<br/>phpBB3 Forums</a></li>
<li><a href="/IndexImportWikimedia_p.html" class="MenuItemLink lock">Dump Reader for <br/>Wikimedia dumps</a></li>
</ul>
</div>
<div class="SubMenugroup">
<h3>Content Import</h3>
<ul class="SubMenu">
<li><a href="/Load_RSS_p.html" class="MenuItemLink lock">RSS Feed<br/>Importer</a></li>
<li><a href="/IndexImportOAIPMH_p.html" class="MenuItemLink lock">OAI-PMH Server<br/>Importer</a></li>
</ul>
</div>
<div class="SubMenugroup">
<h3>Other Harvesting Methods</h3>
<ul class="SubMenu">
<li><a href="/ProxyIndexingMonitor_p.html" class="MenuItemLink lock">Document Harvesting<br/>with Scraping Proxy</a></li>
</ul>
</div>
</div>

3
htroot/yacy/search.java
Unescape View File

@ -166,8 +166,9 @@ public final class search {
}
// tell all threads to do nothing for a specific time
sb.intermissionAllThreads(3000);
sb.intermissionAllThreads(500);
EventTracker.delete(EventTracker.EClass.SEARCH);
final HandleSet abstractSet = ((abstracts.length() == 0) || (abstracts.equals("auto"))) ? null : QueryParams.hashes2Set(abstracts);
// store accessing peer

1
htroot/yacysearch.java
Unescape View File

@ -488,6 +488,7 @@ public class yacysearch {
authenticated,
indexSegment,
ranking);
EventTracker.delete(EventTracker.EClass.SEARCH);
EventTracker.update(EventTracker.EClass.SEARCH, new ProfilingGraph.searchEvent(theQuery.id(true), SearchEvent.Type.INITIALIZATION, "", 0, 0), false);
// tell all threads to do nothing for a specific time

5
source/net/yacy/kelondro/util/EventTracker.java
Unescape View File

@ -49,6 +49,11 @@ public class EventTracker {
private final static Map<EClass, ConcurrentLinkedQueue<Event>> historyMaps = new ConcurrentHashMap<EClass, ConcurrentLinkedQueue<Event>>();
private final static Map<EClass, Long> eventAccess = new ConcurrentHashMap<EClass, Long>(); // value: last time when this was accessed
public final static void delete(final EClass eventName) {
historyMaps.remove(eventName);
eventAccess.remove(eventName);
}
public final static void update(final EClass eventName, final Object eventPayload, boolean useProtection) {
// check protection against too heavy access
if (useProtection) {

Write Preview
Loading…
Cancel
Save