diff --git a/src/main/java/jp/sf/fess/transformer/AbstractFessFileTransformer.java b/src/main/java/jp/sf/fess/transformer/AbstractFessFileTransformer.java index ce0597501..51b9d468f 100644 --- a/src/main/java/jp/sf/fess/transformer/AbstractFessFileTransformer.java +++ b/src/main/java/jp/sf/fess/transformer/AbstractFessFileTransformer.java @@ -175,8 +175,6 @@ public abstract class AbstractFessFileTransformer extends final Date documentExpires = crawlingSessionHelper.getDocumentExpires(); final PathMappingHelper pathMappingHelper = ComponentUtil .getPathMappingHelper(); - final String url = pathMappingHelper.replaceUrl(sessionId, - responseData.getUrl()); final SambaHelper sambaHelper = ComponentUtil.getSambaHelper(); final DynamicProperties crawlerProperties = ComponentUtil .getCrawlerProperties(); @@ -189,6 +187,9 @@ public abstract class AbstractFessFileTransformer extends .get(responseData.getSessionId()); final SystemHelper systemHelper = ComponentUtil.getSystemHelper(); final FileTypeHelper fileTypeHelper = ComponentUtil.getFileTypeHelper(); + String url = responseData.getUrl(); + final String indexingTarget = crawlingConfig.getIndexingTarget(url); + url = pathMappingHelper.replaceUrl(sessionId, url); final Map fieldConfigMap = crawlingConfig .getConfigParameterMap(ConfigName.FIELD); @@ -289,8 +290,7 @@ public abstract class AbstractFessFileTransformer extends putResultDataBody(dataMap, "lastModified", FessFunctions.formatDate(responseData.getLastModified())); // indexingTarget - putResultDataBody(dataMap, Constants.INDEXING_TARGET, - crawlingConfig.getIndexingTarget(url)); + putResultDataBody(dataMap, Constants.INDEXING_TARGET, indexingTarget); // boost putResultDataBody(dataMap, "boost", crawlingConfig.getDocumentBoost()); // label: labelType diff --git a/src/main/java/jp/sf/fess/transformer/FessXpathTransformer.java b/src/main/java/jp/sf/fess/transformer/FessXpathTransformer.java index ea2beeed6..8135de3c6 100644 --- a/src/main/java/jp/sf/fess/transformer/FessXpathTransformer.java +++ b/src/main/java/jp/sf/fess/transformer/FessXpathTransformer.java @@ -213,14 +213,15 @@ public class FessXpathTransformer extends AbstractFessXpathTransformer { final Date documentExpires = crawlingSessionHelper.getDocumentExpires(); final PathMappingHelper pathMappingHelper = ComponentUtil .getPathMappingHelper(); - final String url = pathMappingHelper.replaceUrl(sessionId, - responseData.getUrl()); final CrawlingConfigHelper crawlingConfigHelper = ComponentUtil .getCrawlingConfigHelper(); final CrawlingConfig crawlingConfig = crawlingConfigHelper .get(responseData.getSessionId()); final SystemHelper systemHelper = ComponentUtil.getSystemHelper(); final FileTypeHelper fileTypeHelper = ComponentUtil.getFileTypeHelper(); + String url = responseData.getUrl(); + final String indexingTarget = crawlingConfig.getIndexingTarget(url); + url = pathMappingHelper.replaceUrl(sessionId, url); final Map fieldConfigMap = crawlingConfig .getConfigParameterMap(ConfigName.FIELD); @@ -304,8 +305,7 @@ public class FessXpathTransformer extends AbstractFessXpathTransformer { putResultDataBody(dataMap, "lastModified", FessFunctions.formatDate(responseData.getLastModified())); // indexingTarget - putResultDataBody(dataMap, Constants.INDEXING_TARGET, - crawlingConfig.getIndexingTarget(url)); + putResultDataBody(dataMap, Constants.INDEXING_TARGET, indexingTarget); // boost putResultDataBody(dataMap, "boost", crawlingConfig.getDocumentBoost()); // label: labelType