|
1 | 1 | package org.codelibs.riverweb.crawler; |
2 | 2 |
|
3 | 3 | import java.util.Date; |
4 | | -import java.util.Map; |
5 | 4 |
|
6 | 5 | import org.codelibs.fess.crawler.CrawlerThread; |
7 | 6 | import org.codelibs.fess.crawler.client.CrawlerClient; |
8 | 7 | import org.codelibs.fess.crawler.client.EsClient; |
9 | 8 | import org.codelibs.fess.crawler.entity.UrlQueue; |
10 | | -import org.codelibs.riverweb.RiverWeb; |
11 | 9 | import org.codelibs.riverweb.config.RiverConfig; |
12 | 10 | import org.codelibs.riverweb.config.RiverConfigManager; |
13 | 11 | import org.codelibs.riverweb.util.ConversionUtil; |
14 | | -import org.codelibs.riverweb.util.ScriptUtils; |
15 | 12 | import org.elasticsearch.action.search.SearchResponse; |
16 | 13 | import org.elasticsearch.index.query.QueryBuilders; |
17 | 14 | import org.elasticsearch.search.SearchHitField; |
18 | 15 | import org.elasticsearch.search.SearchHits; |
19 | 16 | import org.elasticsearch.search.sort.SortOrder; |
20 | 17 | import org.lastaflute.di.core.SingletonLaContainer; |
21 | | -import org.lastaflute.di.core.factory.SingletonLaContainerFactory; |
22 | 18 | import org.slf4j.Logger; |
23 | 19 | import org.slf4j.LoggerFactory; |
24 | 20 |
|
@@ -51,26 +47,4 @@ protected boolean isContentUpdated(final CrawlerClient client, final UrlQueue<?> |
51 | 47 | } |
52 | 48 | return super.isContentUpdated(client, urlQueue); |
53 | 49 | } |
54 | | - |
55 | | - protected boolean isValid(final UrlQueue<?> urlQueue) { |
56 | | - if (urlQueue == null) { |
57 | | - return false; |
58 | | - } |
59 | | - final RiverConfigManager riverConfigManager = SingletonLaContainer.getComponent(RiverConfigManager.class); |
60 | | - final RiverConfig riverConfig = riverConfigManager.get(urlQueue.getSessionId()); |
61 | | - if (riverConfig != null) { |
62 | | - final Map<String, Object> scriptSettings = riverConfig.getScriptSettings(); |
63 | | - if (scriptSettings != null) { |
64 | | - Object result = ScriptUtils.execute(scriptSettings, "url_validation", v -> { |
65 | | - v.put("container", SingletonLaContainerFactory.getContainer()); |
66 | | - v.put("urlQueue", urlQueue); |
67 | | - v.put("logger", RiverWeb.logger); |
68 | | - }); |
69 | | - if (result instanceof Boolean) { |
70 | | - return ((Boolean) result).booleanValue(); |
71 | | - } |
72 | | - } |
73 | | - } |
74 | | - return super.isValid(urlQueue); |
75 | | - } |
76 | 50 | } |
0 commit comments