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

fix #194

Browse source
This commit is contained in:
Shinsuke Sugaya 2014-09-12 13:33:52 +09:00
parent 43231e103b
commit 9c524e6fc9
2 changed files with 27 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -111,20 +111,19 @@ public abstract class AbstractFessFileTransformer extends
final String mimeType = responseData.getMimeType();
params.put(HttpHeaders.CONTENT_TYPE, mimeType);
params.put(HttpHeaders.CONTENT_ENCODING, responseData.getCharSet());
final StringBuilder contentBuf = new StringBuilder(1000);
final StringBuilder contentMetaBuf = new StringBuilder(1000);
final Map<String, Object> dataMap = new HashMap<String, Object>();
final Map<String, Object> metaDataMap = new HashMap<>();
String content;
try {
final ExtractData extractData = extractor.getText(in, params);
if (ignoreEmptyContent
&& StringUtil.isBlank(extractData.getContent())) {
content = extractData.getContent();
if (ignoreEmptyContent && StringUtil.isBlank(content)) {
return null;
}
if (logger.isDebugEnabled()) {
logger.debug("ExtractData: " + extractData);
}
contentBuf.append(extractData.getContent());
// meta
for (final String key : extractData.getKeySet()) {
final String[] values = extractData.getValues(key);
@ -158,12 +157,10 @@ public abstract class AbstractFessFileTransformer extends
} finally {
IOUtils.closeQuietly(in);
}
final String content = contentBuf.toString();
final String contentMeta = contentMetaBuf.toString();
if (StringUtil.isBlank(content)) {
return null;
if (content == null) {
content = StringUtil.EMPTY;
}
final String contentMeta = contentMetaBuf.toString();
final ResultData resultData = new ResultData();
resultData.setTransformerName(getName());
@ -215,7 +212,7 @@ public abstract class AbstractFessFileTransformer extends
// segment
putResultDataBody(dataMap, "segment", sessionId);
// content
final StringBuilder buf = new StringBuilder();
final StringBuilder buf = new StringBuilder(content.length() + 1000);
if (appendBodyContentToContent) {
buf.append(content);
}
@ -233,12 +230,8 @@ public abstract class AbstractFessFileTransformer extends
}
if (Constants.TRUE.equalsIgnoreCase(fieldConfigMap.get("cache"))
|| enableCache) {
String cache;
if (content == null) {
cache = StringUtil.EMPTY;
} else {
cache = content.trim().replaceAll("[ \\t\\x0B\\f]+", " ");
}
final String cache = content.trim().replaceAll("[ \\t\\x0B\\f]+",
" ");
// text cache
putResultDataBody(dataMap, "cache", cache);
putResultDataBody(dataMap, systemHelper.hasCacheField,

20
src/main/resources/s2robot_transformer.dicon
View file

@ -38,10 +38,18 @@
<component name="fessFileTransformer" class="jp.sf.fess.transformer.FessFileTransformer" instance="singleton">
<property name="name">"fessFileTransformer"</property>
<property name="ignoreEmptyContent">true</property>
<property name="replaceSiteEncodingWhenEnglish">true</property>
<property name="siteEncoding">"UTF-8"</property>
<initMethod name="addMetaContentMapping">
<arg>"title"</arg>
<arg>"title"</arg>
</initMethod>
<initMethod name="addMetaContentMapping">
<arg>"Subject"</arg>
<arg>"title"</arg>
</initMethod>
<!--
<property name="ignoreEmptyContent">false</property>
<initMethod name="addMetaContentMapping">
<arg>"Author"</arg>
<arg>"author_t"</arg>
@ -51,10 +59,18 @@
<component name="fessTikaTransformer" class="jp.sf.fess.transformer.FessTikaTransformer" instance="singleton">
<property name="name">"fessTikaTransformer"</property>
<property name="ignoreEmptyContent">true</property>
<property name="replaceSiteEncodingWhenEnglish">true</property>
<property name="siteEncoding">"UTF-8"</property>
<initMethod name="addMetaContentMapping">
<arg>"title"</arg>
<arg>"title"</arg>
</initMethod>
<initMethod name="addMetaContentMapping">
<arg>"Title"</arg>
<arg>"title"</arg>
</initMethod>
<!--
<property name="ignoreEmptyContent">false</property>
<initMethod name="addMetaContentMapping">
<arg>"Author"</arg>
<arg>"author_t"</arg>