We use cookies to ensure you get the best experience on our website
首页 发现 帮助
注册 登录
0ct0pu5
/
fess
1
0
派生 0
文件 工单管理 0 合并请求 0 Wiki
浏览代码

update test cases

Shinsuke Sugaya 7 年之前
父节点
0ee0d0717b
当前提交
def1135b38
共有 2 个文件被更改，包括 37 次插入 和 11 次删除
合并视图 显示文件统计
  1. 9 6
      src/main/java/org/codelibs/fess/crawler/transformer/FessXpathTransformer.java
  2. 28 5
      src/test/java/org/codelibs/fess/crawler/transformer/FessXpathTransformerTest.java

+ 9 - 6
src/main/java/org/codelibs/fess/crawler/transformer/FessXpathTransformer.java
查看文件 

@@ -185,9 +185,7 @@ public class FessXpathTransformer extends XpathTransformer implements FessTransf
 
     }
 
     }
 
 
 
     protected void processMetaRobots(final ResponseData responseData, final ResultData resultData, final Document document) {
 
     protected void processMetaRobots(final ResponseData responseData, final ResultData resultData, final Document document) {
 
-        final CrawlingConfigHelper crawlingConfigHelper = ComponentUtil.getCrawlingConfigHelper();
 
-        final CrawlingConfig crawlingConfig = crawlingConfigHelper.get(responseData.getSessionId());
 
-        final Map<String, String> configMap = crawlingConfig.getConfigParameterMap(ConfigName.CONFIG);
 
+        final Map<String, String> configMap = getConfigPrameterMap(responseData, ConfigName.CONFIG);
 
         String ignore = configMap.get(IGNORE_META_ROBOTS);
 
         String ignore = configMap.get(IGNORE_META_ROBOTS);
 
         if (ignore == null) {
 
         if (ignore == null) {
 
             if (fessConfig.isCrawlerIgnoreMetaRobots()) {
 
             if (fessConfig.isCrawlerIgnoreMetaRobots()) {
 
@@ -233,6 +231,13 @@ public class FessXpathTransformer extends XpathTransformer implements FessTransf
 
 
 
     }
 
     }
 
 
 
+    protected Map<String, String> getConfigPrameterMap(final ResponseData responseData, final ConfigName config) {
 
+        final CrawlingConfigHelper crawlingConfigHelper = ComponentUtil.getCrawlingConfigHelper();
 
+        final CrawlingConfig crawlingConfig = crawlingConfigHelper.get(responseData.getSessionId());
 
+        final Map<String, String> configMap = crawlingConfig.getConfigParameterMap(config);
 
+        return configMap;
 
+    }
 
+
 
     protected boolean isValidUrl(final String urlStr) {
 
     protected boolean isValidUrl(final String urlStr) {
 
         if (StringUtil.isBlank(urlStr)) {
 
         if (StringUtil.isBlank(urlStr)) {
 
             return false;
 
             return false;
 
@@ -464,9 +469,7 @@ public class FessXpathTransformer extends XpathTransformer implements FessTransf
 
     }
 
     }
 
 
 
     protected String getCanonicalUrl(final ResponseData responseData, final Document document) {
 
     protected String getCanonicalUrl(final ResponseData responseData, final Document document) {
 
-        final CrawlingConfigHelper crawlingConfigHelper = ComponentUtil.getCrawlingConfigHelper();
 
-        final CrawlingConfig crawlingConfig = crawlingConfigHelper.get(responseData.getSessionId());
 
-        final Map<String, String> configMap = crawlingConfig.getConfigParameterMap(ConfigName.CONFIG);
 
+        final Map<String, String> configMap = getConfigPrameterMap(responseData, ConfigName.CONFIG);
 
         String xpath = configMap.get(HTML_CANONICAL_XPATH);
 
         String xpath = configMap.get(HTML_CANONICAL_XPATH);
 
         if (xpath == null) {
 
         if (xpath == null) {
 
             xpath = fessConfig.getCrawlerDocumentHtmlCanonicalXpath();
 
             xpath = fessConfig.getCrawlerDocumentHtmlCanonicalXpath();

+ 28 - 5
src/test/java/org/codelibs/fess/crawler/transformer/FessXpathTransformerTest.java
查看文件 

@@ -20,6 +20,7 @@ import java.io.StringWriter;
 
 import java.lang.reflect.Field;
 
 import java.lang.reflect.Field;
 
 import java.net.URL;
 
 import java.net.URL;
 
 import java.util.ArrayList;
 
 import java.util.ArrayList;
 
+import java.util.Collections;
 
 import java.util.Date;
 
 import java.util.Date;
 
 import java.util.HashMap;
 
 import java.util.HashMap;
 
 import java.util.List;
 
 import java.util.List;
 
@@ -41,6 +42,7 @@ import org.codelibs.fess.crawler.entity.ResultData;
 
 import org.codelibs.fess.crawler.exception.ChildUrlsException;
 
 import org.codelibs.fess.crawler.exception.ChildUrlsException;
 
 import org.codelibs.fess.es.config.exentity.LabelType;
 
 import org.codelibs.fess.es.config.exentity.LabelType;
 
 import org.codelibs.fess.es.config.exentity.WebConfig;
 
 import org.codelibs.fess.es.config.exentity.WebConfig;
 
+import org.codelibs.fess.es.config.exentity.CrawlingConfig.ConfigName;
 
 import org.codelibs.fess.helper.CrawlingConfigHelper;
 
 import org.codelibs.fess.helper.CrawlingConfigHelper;
 
 import org.codelibs.fess.helper.CrawlingInfoHelper;
 
 import org.codelibs.fess.helper.CrawlingInfoHelper;
 
 import org.codelibs.fess.helper.DocumentHelper;
 
 import org.codelibs.fess.helper.DocumentHelper;
 
@@ -269,7 +271,12 @@ public class FessXpathTransformerTest extends UnitFessTestCase {
 
         final String data = "<html><body>foo</body></html>";
 
         final String data = "<html><body>foo</body></html>";
 
         final Document document = getDocument(data);
 
         final Document document = getDocument(data);
 
 
 
-        final FessXpathTransformer transformer = new FessXpathTransformer();
 
+        final FessXpathTransformer transformer = new FessXpathTransformer() {
 
+            @Override
 
+            protected Map<String, String> getConfigPrameterMap(final ResponseData responseData, final ConfigName config) {
 
+                return Collections.emptyMap();
 
+            }
 
+        };
 
 
 
         final ResponseData responseData = new ResponseData();
 
         final ResponseData responseData = new ResponseData();
 
         responseData.setUrl("http://example.com/");
 
         responseData.setUrl("http://example.com/");
 
@@ -282,7 +289,11 @@ public class FessXpathTransformerTest extends UnitFessTestCase {
 
         final String data = "<meta name=\"robots\" content=\"none\" />";
 
         final String data = "<meta name=\"robots\" content=\"none\" />";
 
         final Document document = getDocument(data);
 
         final Document document = getDocument(data);
 
 
 
-        final FessXpathTransformer transformer = new FessXpathTransformer();
 
+        final FessXpathTransformer transformer = new FessXpathTransformer() {
 
+            protected Map<String, String> getConfigPrameterMap(final ResponseData responseData, final ConfigName config) {
 
+                return Collections.emptyMap();
 
+            }
 
+        };
 
 
 
         final ResponseData responseData = new ResponseData();
 
         final ResponseData responseData = new ResponseData();
 
         responseData.setUrl("http://example.com/");
 
         responseData.setUrl("http://example.com/");
 
@@ -301,7 +312,11 @@ public class FessXpathTransformerTest extends UnitFessTestCase {
 
         final String data = "<meta name=\"ROBOTS\" content=\"NOINDEX,NOFOLLOW\" />";
 
         final String data = "<meta name=\"ROBOTS\" content=\"NOINDEX,NOFOLLOW\" />";
 
         final Document document = getDocument(data);
 
         final Document document = getDocument(data);
 
 
 
-        final FessXpathTransformer transformer = new FessXpathTransformer();
 
+        final FessXpathTransformer transformer = new FessXpathTransformer() {
 
+            protected Map<String, String> getConfigPrameterMap(final ResponseData responseData, final ConfigName config) {
 
+                return Collections.emptyMap();
 
+            }
 
+        };
 
 
 
         final ResponseData responseData = new ResponseData();
 
         final ResponseData responseData = new ResponseData();
 
         responseData.setUrl("http://example.com/");
 
         responseData.setUrl("http://example.com/");
 
@@ -340,7 +355,11 @@ public class FessXpathTransformerTest extends UnitFessTestCase {
 
         final String data = "<meta name=\"robots\" content=\"nofollow\" />";
 
         final String data = "<meta name=\"robots\" content=\"nofollow\" />";
 
         final Document document = getDocument(data);
 
         final Document document = getDocument(data);
 
 
 
-        final FessXpathTransformer transformer = new FessXpathTransformer();
 
+        final FessXpathTransformer transformer = new FessXpathTransformer() {
 
+            protected Map<String, String> getConfigPrameterMap(final ResponseData responseData, final ConfigName config) {
 
+                return Collections.emptyMap();
 
+            }
 
+        };
 
 
 
         final ResponseData responseData = new ResponseData();
 
         final ResponseData responseData = new ResponseData();
 
         responseData.setUrl("http://example.com/");
 
         responseData.setUrl("http://example.com/");
 
@@ -428,7 +447,11 @@ public class FessXpathTransformerTest extends UnitFessTestCase {
 
     }
 
     }
 
 
 
     public void test_canonicalXpath() throws Exception {
 
     public void test_canonicalXpath() throws Exception {
 
-        final FessXpathTransformer transformer = new FessXpathTransformer();
 
+        final FessXpathTransformer transformer = new FessXpathTransformer() {
 
+            protected Map<String, String> getConfigPrameterMap(final ResponseData responseData, final ConfigName config) {
 
+                return Collections.emptyMap();
 
+            }
 
+        };
 
         transformer.init();
 
         transformer.init();
 
 
 
         final Map<String, Object> dataMap = new HashMap<String, Object>();
 
         final Map<String, Object> dataMap = new HashMap<String, Object>();

Contact | Legal | Takedown | Status
Self-hosted public services - About
NibbleSpot by 0ct0pu5