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

fix #43

Browse source
This commit is contained in:
Shinsuke Sugaya 2013-11-15 15:17:27 +09:00
parent 5dd4a0bec1
commit 38ba1e58b5
2 changed files with 18 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/main/java/jp/sf/fess/transformer/AbstractFessFileTransformer.java
View file

@ -185,6 +185,13 @@ public abstract class AbstractFessFileTransformer extends
.getComponent("crawlingConfigHelper");
final CrawlingConfig crawlingConfig = crawlingConfigHelper
.get(responseData.getSessionId());
String urlEncoding;
final UrlQueue urlQueue = CrawlingParameterUtil.getUrlQueue();
if (urlQueue != null && urlQueue.getEncoding() != null) {
urlEncoding = urlQueue.getEncoding();
} else {
urlEncoding = responseData.getCharSet();
}
// cid
final String configId = crawlingConfig.getConfigId();
@ -246,8 +253,7 @@ public abstract class AbstractFessFileTransformer extends
// host
putResultDataBody(dataMap, "host", getHost(url));
// site
putResultDataBody(dataMap, "site",
getSite(url, responseData.getCharSet()));
putResultDataBody(dataMap, "site", getSite(url, urlEncoding));
// url
putResultDataBody(dataMap, "url", url);
// created

12
src/main/java/jp/sf/fess/transformer/FessXpathTransformer.java
View file

@ -58,6 +58,8 @@ import org.seasar.robot.client.fs.ChildUrlsException;
import org.seasar.robot.entity.AccessResultData;
import org.seasar.robot.entity.ResponseData;
import org.seasar.robot.entity.ResultData;
import org.seasar.robot.entity.UrlQueue;
import org.seasar.robot.util.CrawlingParameterUtil;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.w3c.dom.Document;
@ -218,6 +220,13 @@ public class FessXpathTransformer extends AbstractFessXpathTransformer {
.getComponent("crawlingConfigHelper");
final CrawlingConfig crawlingConfig = crawlingConfigHelper
.get(responseData.getSessionId());
String urlEncoding;
final UrlQueue urlQueue = CrawlingParameterUtil.getUrlQueue();
if (urlQueue != null && urlQueue.getEncoding() != null) {
urlEncoding = urlQueue.getEncoding();
} else {
urlEncoding = responseData.getCharSet();
}
// cid
final String configId = crawlingConfig.getConfigId();
@ -247,8 +256,7 @@ public class FessXpathTransformer extends AbstractFessXpathTransformer {
// host
putResultDataBody(dataMap, "host", getHost(url));
// site
putResultDataBody(dataMap, "site",
getSite(url, responseData.getCharSet()));
putResultDataBody(dataMap, "site", getSite(url, urlEncoding));
// url
putResultDataBody(dataMap, "url", url);
// created