0ct0pu5/fess
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix #453 : improve sitePath

Browse source
This commit is contained in:
Shinsuke Sugaya 2016-03-25 22:50:41 +09:00
parent 9dc7497be0
commit 26b4ad5b25
2 changed files with 35 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/main/java/org/codelibs/fess/helper/ViewHelper.java
View file

@ -78,6 +78,10 @@ import com.ibm.icu.text.SimpleDateFormat;
public class ViewHelper implements Serializable {
private static final Pattern LOCAL_PATH_PATTERN = Pattern.compile("^file:/+[a-zA-Z]:");
private static final Pattern SHARED_FOLDER_PATTERN = Pattern.compile("^file:/+[^/]\\.");
private static final long serialVersionUID = 1L;
private static final Logger logger = LoggerFactory.getLogger(ViewHelper.class);
@ -477,7 +481,16 @@ public class ViewHelper implements Serializable {
public Object getSitePath(final Map<String, Object> docMap) {
final Object urlLink = docMap.get("urlLink");
if (urlLink != null) {
return StringUtils.abbreviate(urlLink.toString().replaceFirst("^[a-zA-Z0-9]*:/?/*", ""), sitePathLength);
final String returnUrl;
final String url = urlLink.toString();
if (LOCAL_PATH_PATTERN.matcher(url).find() || SHARED_FOLDER_PATTERN.matcher(url).find()) {
returnUrl = url.replaceFirst("^file:/+", "");
} else if (url.startsWith("file:")) {
returnUrl = url.replaceFirst("^file:/+", "/");
} else {
returnUrl = url.replaceFirst("^[a-zA-Z0-9]*:/+", "");
}
return StringUtils.abbreviate(returnUrl, sitePathLength);
}
return null;
}

22
src/test/java/org/codelibs/fess/helper/ViewHelperTest.java
View file

@ -118,6 +118,11 @@ public class ViewHelperTest extends UnitFessTestCase {
docMap.put("urlLink", urlLink);
assertEquals(sitePath, viewHelper.getSitePath(docMap));
urlLink = "://www.qwerty.jp";
sitePath = "www.qwerty.jp";
docMap.put("urlLink", urlLink);
assertEquals(sitePath, viewHelper.getSitePath(docMap));
urlLink = "www.google.com";
sitePath = "www.google.com";
docMap.put("urlLink", urlLink);
@ -128,8 +133,23 @@ public class ViewHelperTest extends UnitFessTestCase {
docMap.put("urlLink", urlLink);
assertEquals(sitePath, viewHelper.getSitePath(docMap));
urlLink = "file:/home/user/";
sitePath = "/home/user/";
docMap.put("urlLink", urlLink);
assertEquals(sitePath, viewHelper.getSitePath(docMap));
urlLink = "file://home/user/";
sitePath = "home/user/";
sitePath = "/home/user/";
docMap.put("urlLink", urlLink);
assertEquals(sitePath, viewHelper.getSitePath(docMap));
urlLink = "file://c:/home/user/";
sitePath = "c:/home/user/";
docMap.put("urlLink", urlLink);
assertEquals(sitePath, viewHelper.getSitePath(docMap));
urlLink = "file://1.2.3.4/user/";
sitePath = "1.2.3.4/user/";
docMap.put("urlLink", urlLink);
assertEquals(sitePath, viewHelper.getSitePath(docMap));
}