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

fix #2279 use labels.facet_filetype

Browse source
This commit is contained in:
Shinsuke Sugaya 2019-10-21 23:42:02 +09:00
parent 6bcefd9b63
commit 6a9d263f0a
9 changed files with 18 additions and 139 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/main/java/org/codelibs/fess/entity/FacetQueryView.java
View file

@ -19,6 +19,7 @@ import java.util.Collection;
import java.util.LinkedHashMap;
import java.util.Locale;
import java.util.Map;
import java.util.ResourceBundle;
import javax.annotation.PostConstruct;
@ -36,13 +37,19 @@ public class FacetQueryView {
@PostConstruct
public void init() {
final String filetypeField = ComponentUtil.getFessConfig().getIndexFieldFiletype();
Collection<String> values = queryMap.values();
final Collection<String> values = queryMap.values();
if (values.stream().anyMatch(s -> s.startsWith(filetypeField))) {
final ResourceBundle resources = ResourceBundle.getBundle("fess_label", Locale.ENGLISH);
final String[] fileTypes = ComponentUtil.getFileTypeHelper().getTypes();
for (String fileType : fileTypes) {
for (final String fileType : fileTypes) {
final String value = filetypeField + ":" + fileType;
if (!values.contains(value)) {
queryMap.put(fileType.toUpperCase(Locale.ROOT), value);
final String key = "labels.facet_filetype_" + fileType;
if (resources.containsKey(key)) {
queryMap.put(key, value);
} else {
queryMap.put(fileType.toUpperCase(Locale.ROOT), value);
}
}
}
queryMap.remove("labels.facet_filetype_others");

4
src/main/java/org/codelibs/fess/helper/FileTypeHelper.java
View file

@ -15,7 +15,7 @@
*/
package org.codelibs.fess.helper;
import java.util.HashMap;
import java.util.LinkedHashMap;
import java.util.Map;
import javax.annotation.PostConstruct;
@ -32,7 +32,7 @@ public class FileTypeHelper {
protected String defaultValue = "others";
protected Map<String, String> mimetypeMap = new HashMap<>();
protected Map<String, String> mimetypeMap = new LinkedHashMap<>();
@PostConstruct
public void init() {

128
src/main/resources/app.xml
View file

@ -167,138 +167,10 @@
<arg>"labels.facet_filetype_pdf"</arg>
<arg>"filetype:pdf"</arg>
</postConstruct>
<postConstruct name="addQuery">
<arg>"labels.facet_filetype_fb2"</arg>
<arg>"filetype:fb2"</arg>
</postConstruct>
<postConstruct name="addQuery">
<arg>"labels.facet_filetype_epub"</arg>
<arg>"filetype:epub"</arg>
</postConstruct>
<postConstruct name="addQuery">
<arg>"labels.facet_filetype_ibooks"</arg>
<arg>"filetype:ibooks"</arg>
</postConstruct>
<postConstruct name="addQuery">
<arg>"labels.facet_filetype_txt"</arg>
<arg>"filetype:txt"</arg>
</postConstruct>
<postConstruct name="addQuery">
<arg>"labels.facet_filetype_rtf"</arg>
<arg>"filetype:rtf"</arg>
</postConstruct>
<postConstruct name="addQuery">
<arg>"labels.facet_filetype_chm"</arg>
<arg>"filetype:chm"</arg>
</postConstruct>
<postConstruct name="addQuery">
<arg>"labels.facet_filetype_zip"</arg>
<arg>"filetype:zip"</arg>
</postConstruct>
<postConstruct name="addQuery">
<arg>"labels.facet_filetype_7z"</arg>
<arg>"filetype:7z"</arg>
</postConstruct>
<postConstruct name="addQuery">
<arg>"labels.facet_filetype_bz"</arg>
<arg>"filetype:bz"</arg>
</postConstruct>
<postConstruct name="addQuery">
<arg>"labels.facet_filetype_bz2"</arg>
<arg>"filetype:bz2"</arg>
</postConstruct>
<postConstruct name="addQuery">
<arg>"labels.facet_filetype_tar"</arg>
<arg>"filetype:tar"</arg>
</postConstruct>
<postConstruct name="addQuery">
<arg>"labels.facet_filetype_rar"</arg>
<arg>"filetype:rar"</arg>
</postConstruct>
<postConstruct name="addQuery">
<arg>"labels.facet_filetype_3gp"</arg>
<arg>"filetype:3gp"</arg>
</postConstruct>
<postConstruct name="addQuery">
<arg>"labels.facet_filetype_3g2"</arg>
<arg>"filetype:3g2"</arg>
</postConstruct>
<postConstruct name="addQuery">
<arg>"labels.facet_filetype_avi"</arg>
<arg>"filetype:avi"</arg>
</postConstruct>
<postConstruct name="addQuery">
<arg>"labels.facet_filetype_flv"</arg>
<arg>"filetype:flv"</arg>
</postConstruct>
<postConstruct name="addQuery">
<arg>"labels.facet_filetype_mpeg"</arg>
<arg>"filetype:mpeg"</arg>
</postConstruct>
<postConstruct name="addQuery">
<arg>"labels.facet_filetype_mp4"</arg>
<arg>"filetype:mp4"</arg>
</postConstruct>
<postConstruct name="addQuery">
<arg>"labels.facet_filetype_ogv"</arg>
<arg>"filetype:ogv"</arg>
</postConstruct>
<postConstruct name="addQuery">
<arg>"labels.facet_filetype_qt"</arg>
<arg>"filetype:qt"</arg>
</postConstruct>
<postConstruct name="addQuery">
<arg>"labels.facet_filetype_m4v"</arg>
<arg>"filetype:m4v"</arg>
</postConstruct>
<postConstruct name="addQuery">
<arg>"labels.facet_filetype_aif"</arg>
<arg>"filetype:aif"</arg>
</postConstruct>
<postConstruct name="addQuery">
<arg>"labels.facet_filetype_mid"</arg>
<arg>"filetype:midi"</arg>
</postConstruct>
<postConstruct name="addQuery">
<arg>"labels.facet_filetype_mpga"</arg>
<arg>"filetype:mpga"</arg>
</postConstruct>
<postConstruct name="addQuery">
<arg>"labels.facet_filetype_ogg"</arg>
<arg>"filetype:ogg"</arg>
</postConstruct>
<postConstruct name="addQuery">
<arg>"labels.facet_filetype_wav"</arg>
<arg>"filetype:wav"</arg>
</postConstruct>
<postConstruct name="addQuery">
<arg>"labels.facet_filetype_webp"</arg>
<arg>"filetype:webp"</arg>
</postConstruct>
<postConstruct name="addQuery">
<arg>"labels.facet_filetype_bmp"</arg>
<arg>"filetype:bmp"</arg>
</postConstruct>
<postConstruct name="addQuery">
<arg>"labels.facet_filetype_ico"</arg>
<arg>"filetype:ico"</arg>
</postConstruct>
<postConstruct name="addQuery">
<arg>"labels.facet_filetype_png"</arg>
<arg>"filetype:png"</arg>
</postConstruct>
<postConstruct name="addQuery">
<arg>"labels.facet_filetype_svg"</arg>
<arg>"filetype:svg"</arg>
</postConstruct>
<postConstruct name="addQuery">
<arg>"labels.facet_filetype_tiff"</arg>
<arg>"filetype:tiff"</arg>
</postConstruct>
<postConstruct name="addQuery">
<arg>"labels.facet_filetype_jpg"</arg>
<arg>"filetype:jpg"</arg>
</postConstruct>
<postConstruct name="addQuery">
<arg>"labels.facet_filetype_others"</arg>
<arg>"filetype:others"</arg>

2
src/main/resources/fess_label.properties
View file

@ -278,7 +278,7 @@ labels.facet_filetype_ogg=OGG Audio
labels.facet_filetype_wav=WAV Audio
labels.facet_filetype_webp=WebP Audio
labels.facet_filetype_aif=AIF Audio
labels.facet_filetype_mid=MIDI Audio
labels.facet_filetype_midi=MIDI Audio
labels.facet_filetype_mpga=MPGA Audio
labels.facet_filetype_mp4a=MP4A Audio
labels.facet_filetype_oga=OGA Audio

2
src/main/resources/fess_label_de.properties
View file

@ -268,7 +268,7 @@ labels.facet_filetype_ogg=OGG Audio
labels.facet_filetype_wav=WAV Audio
labels.facet_filetype_webp=WebP Audio
labels.facet_filetype_aif=AIF Audio
labels.facet_filetype_mid=MIDI Audio
labels.facet_filetype_midi=MIDI Audio
labels.facet_filetype_mpga=MPGA Audio
labels.facet_filetype_mp4a=MP4A Audio
labels.facet_filetype_oga=OGA Audio

2
src/main/resources/fess_label_en.properties
View file

@ -278,7 +278,7 @@ labels.facet_filetype_ogg=OGG Audio
labels.facet_filetype_wav=WAV Audio
labels.facet_filetype_webp=WebP Audio
labels.facet_filetype_aif=AIF Audio
labels.facet_filetype_mid=MIDI Audio
labels.facet_filetype_midi=MIDI Audio
labels.facet_filetype_mpga=MPGA Audio
labels.facet_filetype_mp4a=MP4A Audio
labels.facet_filetype_oga=OGA Audio

2
src/main/resources/fess_label_ja.properties
View file

@ -270,7 +270,7 @@ labels.facet_filetype_ogg=OGGオーディオ
labels.facet_filetype_wav=WAVオーディオ
labels.facet_filetype_webp=WebPオーディオ
labels.facet_filetype_aif=AIFオーディオ
labels.facet_filetype_mid=MIDIオーディオ
labels.facet_filetype_midi=MIDIオーディオ
labels.facet_filetype_mpga=MPGAオーディオ
labels.facet_filetype_mp4a=MP4Aオーディオ
labels.facet_filetype_oga=OGAオーディオ

2
src/main/resources/fess_label_ko.properties
View file

@ -254,7 +254,7 @@ labels.facet_filetype_m4v = M4V 비디오
labels.facet_filetype_ogg = OGG 오디오
labels.facet_filetype_wav = WAV 오디오
labels.facet_filetype_aif = AIF 오디오
labels.facet_filetype_mid = MIDI 오디오
labels.facet_filetype_midi = MIDI 오디오
labels.facet_filetype_mpga = MPGA 오디오
labels.facet_filetype_mp4a = MP4A 오디오
labels.facet_filetype_oga = OGA 오디오

2
src/main/resources/fess_label_ru.properties
View file

@ -257,7 +257,7 @@ labels.facet_filetype_ogg=OGG Audio
labels.facet_filetype_wav=WAV Audio
labels.facet_filetype_webp=WebP Audio
labels.facet_filetype_aif=AIF Audio
labels.facet_filetype_mid=MIDI Audio
labels.facet_filetype_midi=MIDI Audio
labels.facet_filetype_mpga=MPGA Audio
labels.facet_filetype_mp4a=MP4A Audio
labels.facet_filetype_oga=OGA Audio