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

fix #235

Browse source
This commit is contained in:
shatake 2014-12-13 20:06:58 +09:00
parent 3ef93b2355
commit d9274ac924
1 changed files with 26 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
src/main/java/jp/sf/fess/helper/WebFsIndexHelper.java
View file

@ -350,31 +350,49 @@ public class WebFsIndexHelper implements Serializable {
}
// set included paths
boolean urlEncodeDisabled = false;
final String[] includedPaths = includedPathsStr.split("[\r\n]");
for (final String u : includedPaths) {
if (StringUtil.isNotBlank(u)) {
final String urlValue = u.trim();
if (!urlValue.startsWith("#")) {
s2Robot.addIncludeFilter(systemHelper
.encodeUrlFilter(urlValue));
final String line = u.trim();
if (!line.startsWith("#")) {
final String urlValue;
if (urlEncodeDisabled) {
urlValue = line;
urlEncodeDisabled = false;
} else {
urlValue = systemHelper.encodeUrlFilter(line);
}
s2Robot.addIncludeFilter(urlValue);
if (logger.isInfoEnabled()) {
logger.info("Included Path: " + urlValue);
}
} else if (line.startsWith("#DISABLE_URL_ENCODE")) {
urlEncodeDisabled = true;
}
}
}
// set excluded paths
urlEncodeDisabled = false;
final String[] excludedPaths = excludedPathsStr.split("[\r\n]");
for (final String u : excludedPaths) {
if (StringUtil.isNotBlank(u)) {
final String urlValue = u.trim();
if (!urlValue.startsWith("#")) {
s2Robot.addExcludeFilter(systemHelper
.encodeUrlFilter(urlValue));
final String line = u.trim();
if (!line.startsWith("#")) {
final String urlValue;
if (urlEncodeDisabled) {
urlValue = line;
urlEncodeDisabled = false;
} else {
urlValue = systemHelper.encodeUrlFilter(line);
}
s2Robot.addExcludeFilter(urlValue);
if (logger.isInfoEnabled()) {
logger.info("Excluded Path: " + urlValue);
}
} else if (line.startsWith("#DISABLE_URL_ENCODE")) {
urlEncodeDisabled = true;
}
}
}