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

fix #2411 add tika.xml

Browse source
This commit is contained in:
Shinsuke Sugaya 2020-02-24 21:59:41 +09:00
parent 13b8b52194
commit 4b89b0b511
4 changed files with 23 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
pom.xml
View file

@ -453,7 +453,7 @@
<data>
<type>directory</type>
<src>${project.build.directory}/fess</src>
<excludes>**/fess_config.properties,**/fess_env*.properties</excludes>
<excludes>**/fess_config.properties,**/fess_env*.properties,**/tika.xml</excludes>
<mapper>
<type>perm</type>
<prefix>${packaging.fess.app.dir}</prefix>
@ -515,6 +515,7 @@
<path>${project.build.directory}/fess/WEB-INF/classes/fess_env_suggest.properties</path>
<path>${project.build.directory}/fess/WEB-INF/classes/fess_env_thumbnail.properties</path>
<path>${project.build.directory}/fess/WEB-INF/classes/fess_env_web.properties</path>
<path>${project.build.directory}/fess/WEB-INF/classes/tika.xml</path>
</paths>
<dst>${packaging.fess.conf.dir}</dst>
<mapper>
@ -727,6 +728,7 @@
<excludes>
<exclude>**/fess_config.properties</exclude>
<exclude>**/fess_env*.properties</exclude>
<exclude>**/tika.xml</exclude>
</excludes>
</source>
</sources>
@ -771,6 +773,7 @@
<include>fess_env_suggest.properties</include>
<include>fess_env_thumbnail.properties</include>
<include>fess_env_web.properties</include>
<include>tika.xml</include>
</includes>
</source>
</sources>

8
src/main/java/org/codelibs/fess/util/ResourceUtil.java
View file

@ -83,6 +83,14 @@ public class ResourceUtil {
return getPath("WEB-INF/", "conf", names);
}
public static Path getConfOrClassesPath(final String... names) {
Path confPath = getConfPath(names);
if (Files.exists(confPath)) {
return confPath;
}
return org.codelibs.core.io.ResourceUtil.getResourceAsFile(String.join("/", names)).toPath();
}
public static Path getClassesPath(final String... names) {
return getPath("WEB-INF/", "classes", names);
}

3
src/main/resources/fess.xml
View file

@ -131,4 +131,7 @@
<property name="roleSeparator">","</property>
-->
</component>
<component name="tikaConfig" class="org.apache.tika.config.TikaConfig">
<arg>org.codelibs.fess.util.ResourceUtil.getConfOrClassesPath("tika.xml")</arg>
</component>
</components>

8
src/main/resources/tika.xml Normal file
View file

@ -0,0 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<properties>
<parsers>
<parser class="org.apache.tika.parser.DefaultParser">
<parser-exclude class="org.apache.tika.parser.ocr.TesseractOCRParser"/>
</parser>
</parsers>
</properties>