浏览代码

fix #569 : Site path is not displayed on search result page

yfujita 9 年之前
父节点
当前提交
8f5100fd36

+ 2 - 1
src/main/java/org/codelibs/fess/helper/ViewHelper.java

@@ -480,7 +480,8 @@ public class ViewHelper {
     }
     }
 
 
     public Object getSitePath(final Map<String, Object> docMap) {
     public Object getSitePath(final Map<String, Object> docMap) {
-        final Object urlLink = docMap.get("urlLink");
+        final FessConfig fessConfig = ComponentUtil.getFessConfig();
+        final Object urlLink = docMap.get(fessConfig.getResponseFieldUrlLink());
         if (urlLink != null) {
         if (urlLink != null) {
             final String returnUrl;
             final String returnUrl;
             final String url = urlLink.toString();
             final String url = urlLink.toString();

+ 15 - 10
src/test/java/org/codelibs/fess/helper/ViewHelperTest.java

@@ -18,7 +18,9 @@ package org.codelibs.fess.helper;
 import java.util.HashMap;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Map;
 
 
+import org.codelibs.fess.mylasta.direction.FessConfig;
 import org.codelibs.fess.unit.UnitFessTestCase;
 import org.codelibs.fess.unit.UnitFessTestCase;
+import org.codelibs.fess.util.ComponentUtil;
 
 
 public class ViewHelperTest extends UnitFessTestCase {
 public class ViewHelperTest extends UnitFessTestCase {
     public ViewHelper viewHelper;
     public ViewHelper viewHelper;
@@ -103,54 +105,57 @@ public class ViewHelperTest extends UnitFessTestCase {
         String sitePath;
         String sitePath;
         final Map<String, Object> docMap = new HashMap<>();
         final Map<String, Object> docMap = new HashMap<>();
 
 
+        final FessConfig fessConfig = ComponentUtil.getFessConfig();
+        final String fieldName = fessConfig.getResponseFieldUrlLink();
+
         urlLink = "http://www.google.com";
         urlLink = "http://www.google.com";
         sitePath = "www.google.com";
         sitePath = "www.google.com";
-        docMap.put("urlLink", urlLink);
+        docMap.put(fieldName, urlLink);
         assertEquals(sitePath, viewHelper.getSitePath(docMap));
         assertEquals(sitePath, viewHelper.getSitePath(docMap));
 
 
         urlLink = "https://www.jp.websecurity.symantec.com/";
         urlLink = "https://www.jp.websecurity.symantec.com/";
         sitePath = "www.jp.websecurity.symantec.com/";
         sitePath = "www.jp.websecurity.symantec.com/";
-        docMap.put("urlLink", urlLink);
+        docMap.put(fieldName, urlLink);
         assertEquals(sitePath, viewHelper.getSitePath(docMap));
         assertEquals(sitePath, viewHelper.getSitePath(docMap));
 
 
         urlLink = "http://www.qwerty.jp";
         urlLink = "http://www.qwerty.jp";
         sitePath = "www.qwerty.jp";
         sitePath = "www.qwerty.jp";
-        docMap.put("urlLink", urlLink);
+        docMap.put(fieldName, urlLink);
         assertEquals(sitePath, viewHelper.getSitePath(docMap));
         assertEquals(sitePath, viewHelper.getSitePath(docMap));
 
 
         urlLink = "://www.qwerty.jp";
         urlLink = "://www.qwerty.jp";
         sitePath = "www.qwerty.jp";
         sitePath = "www.qwerty.jp";
-        docMap.put("urlLink", urlLink);
+        docMap.put(fieldName, urlLink);
         assertEquals(sitePath, viewHelper.getSitePath(docMap));
         assertEquals(sitePath, viewHelper.getSitePath(docMap));
 
 
         urlLink = "www.google.com";
         urlLink = "www.google.com";
         sitePath = "www.google.com";
         sitePath = "www.google.com";
-        docMap.put("urlLink", urlLink);
+        docMap.put(fieldName, urlLink);
         assertEquals(sitePath, viewHelper.getSitePath(docMap));
         assertEquals(sitePath, viewHelper.getSitePath(docMap));
 
 
         urlLink = "smb://123.45.678.91/share1";
         urlLink = "smb://123.45.678.91/share1";
         sitePath = "123.45.678.91/share1";
         sitePath = "123.45.678.91/share1";
-        docMap.put("urlLink", urlLink);
+        docMap.put(fieldName, urlLink);
         assertEquals(sitePath, viewHelper.getSitePath(docMap));
         assertEquals(sitePath, viewHelper.getSitePath(docMap));
 
 
         urlLink = "file:/home/user/";
         urlLink = "file:/home/user/";
         sitePath = "/home/user/";
         sitePath = "/home/user/";
-        docMap.put("urlLink", urlLink);
+        docMap.put(fieldName, urlLink);
         assertEquals(sitePath, viewHelper.getSitePath(docMap));
         assertEquals(sitePath, viewHelper.getSitePath(docMap));
 
 
         urlLink = "file://home/user/";
         urlLink = "file://home/user/";
         sitePath = "/home/user/";
         sitePath = "/home/user/";
-        docMap.put("urlLink", urlLink);
+        docMap.put(fieldName, urlLink);
         assertEquals(sitePath, viewHelper.getSitePath(docMap));
         assertEquals(sitePath, viewHelper.getSitePath(docMap));
 
 
         urlLink = "file://c:/home/user/";
         urlLink = "file://c:/home/user/";
         sitePath = "c:/home/user/";
         sitePath = "c:/home/user/";
-        docMap.put("urlLink", urlLink);
+        docMap.put(fieldName, urlLink);
         assertEquals(sitePath, viewHelper.getSitePath(docMap));
         assertEquals(sitePath, viewHelper.getSitePath(docMap));
 
 
         urlLink = "file://1.2.3.4/user/";
         urlLink = "file://1.2.3.4/user/";
         sitePath = "1.2.3.4/user/";
         sitePath = "1.2.3.4/user/";
-        docMap.put("urlLink", urlLink);
+        docMap.put(fieldName, urlLink);
         assertEquals(sitePath, viewHelper.getSitePath(docMap));
         assertEquals(sitePath, viewHelper.getSitePath(docMap));
     }
     }
 }
 }