diff --git a/src/main/java/org/codelibs/fess/mylasta/action/FessLabels.java b/src/main/java/org/codelibs/fess/mylasta/action/FessLabels.java index 60a365bb7..7b4a39f59 100644 --- a/src/main/java/org/codelibs/fess/mylasta/action/FessLabels.java +++ b/src/main/java/org/codelibs/fess/mylasta/action/FessLabels.java @@ -701,18 +701,36 @@ public class FessLabels extends UserMessages { /** The key of the message: HTML */ public static final String LABELS_facet_filetype_html = "{labels.facet_filetype_html}"; - /** The key of the message: Word */ + /** The key of the message: MS Word */ public static final String LABELS_facet_filetype_word = "{labels.facet_filetype_word}"; - /** The key of the message: Excel */ + /** The key of the message: MS Excel */ public static final String LABELS_facet_filetype_excel = "{labels.facet_filetype_excel}"; - /** The key of the message: PowerPoint */ + /** The key of the message: MS PowerPoint */ public static final String LABELS_facet_filetype_powerpoint = "{labels.facet_filetype_powerpoint}"; + /** The key of the message: ODF Word */ + public static final String LABELS_facet_filetype_odt = "{labels.facet_filetype_odt}"; + + /** The key of the message: ODF Spreadsheet */ + public static final String LABELS_facet_filetype_ods = "{labels.facet_filetype_ods}"; + + /** The key of the message: ODP Presentation */ + public static final String LABELS_facet_filetype_odp = "{labels.facet_filetype_odp}"; + /** The key of the message: PDF */ public static final String LABELS_facet_filetype_pdf = "{labels.facet_filetype_pdf}"; + /** The key of the message: FictionBook */ + public static final String LABELS_facet_filetype_fb2 = "{labels.facet_filetype_fb2}"; + + /** The key of the message: EPUB */ + public static final String LABELS_facet_filetype_epub = "{labels.facet_filetype_epub}"; + + /** The key of the message: iBooks */ + public static final String LABELS_facet_filetype_ibooks = "{labels.facet_filetype_ibooks}"; + /** The key of the message: Others */ public static final String LABELS_facet_filetype_others = "{labels.facet_filetype_others}"; diff --git a/src/main/resources/app.xml b/src/main/resources/app.xml index 1f01c96c5..c4fe84167 100644 --- a/src/main/resources/app.xml +++ b/src/main/resources/app.xml @@ -54,6 +54,7 @@ "filetype:excel", "filetype:powerpoint", "filetype:odt", + "filetype:ods", "filetype:odp", "filetype:pdf", "filetype:fb2", @@ -105,7 +106,7 @@ "labels.facet_contentLength_10kto100k" "content_length:[10000 TO 99999]" -  + "labels.facet_contentLength_100kto500k" "content_length:[100000 TO 499999]" @@ -141,10 +142,34 @@ "labels.facet_filetype_powerpoint" "filetype:powerpoint" + + "labels.facet_filetype_odt" + "filetype:odt" + + + "labels.facet_filetype_ods" + "filetype:ods" + + + "labels.facet_filetype_odp" + "filetype:odp" + "labels.facet_filetype_pdf" "filetype:pdf" + + "labels.facet_filetype_fb2" + "filetype:fb2" + + + "labels.facet_filetype_epub" + "filetype:epub" + + + "labels.facet_filetype_ibooks" + "filetype:ibooks" + "labels.facet_filetype_others" "filetype:others" diff --git a/src/main/resources/fess_label.properties b/src/main/resources/fess_label.properties index 29b47891b..cb60b7166 100644 --- a/src/main/resources/fess_label.properties +++ b/src/main/resources/fess_label.properties @@ -224,15 +224,16 @@ labels.facet_contentLength_500kto1m=500kb - 1mb labels.facet_contentLength_1m=1mb -   labels.facet_filetype_title=File Type labels.facet_filetype_html=HTML -labels.facet_filetype_word=DOC (MS Word) -labels.facet_filetype_excel=XLS (MS Excel) -labels.facet_filetype_powerpoint=PPT (MS PowerPoint) -labels.facet_filetype_odt=ODT (OpenDocument Text) -labels.facet_filetype_odp=ODP (ODPresentation) -labels.facet_filetype_pdf=PDF (Portable Document Format) -labels.facet_filetype_pdf=FB2 (FictionBook2) -labels.facet_filetype_pdf=EPUB (Electronic Publication) -labels.facet_filetype_pdf=IBOOKS (Apple) +labels.facet_filetype_word=MS Word +labels.facet_filetype_excel=MS Excel +labels.facet_filetype_powerpoint=MS PowerPoint +labels.facet_filetype_odt=ODF Word +labels.facet_filetype_ods=ODF Spreadsheet +labels.facet_filetype_odp=ODP Presentation +labels.facet_filetype_pdf=PDF +labels.facet_filetype_fb2=FictionBook +labels.facet_filetype_epub=EPUB +labels.facet_filetype_ibooks=iBooks labels.facet_filetype_others=Others labels.facet_label_reset=Reset labels.searchoptions_all=All diff --git a/src/main/resources/fess_label_en.properties b/src/main/resources/fess_label_en.properties index 0ee602e8f..0d24fddec 100644 --- a/src/main/resources/fess_label_en.properties +++ b/src/main/resources/fess_label_en.properties @@ -224,15 +224,16 @@ labels.facet_contentLength_500kto1m=500kb - 1mb labels.facet_contentLength_1m=1mb -   labels.facet_filetype_title=File Type labels.facet_filetype_html=HTML -labels.facet_filetype_word=DOC (MS Word) -labels.facet_filetype_excel=XLS (MS Excel) -labels.facet_filetype_powerpoint=PPT (MS PowerPoint) -labels.facet_filetype_odt=ODT (OpenDocument Text) -labels.facet_filetype_odp=ODP (ODPresentation) -labels.facet_filetype_pdf=PDF (Portable Document Format) -labels.facet_filetype_pdf=FB2 (FictionBook) -labels.facet_filetype_pdf=EPUB (Electronic Publication) -labels.facet_filetype_pdf=IBOOKS (Apple) +labels.facet_filetype_word=MS Word +labels.facet_filetype_excel=MS Excel +labels.facet_filetype_powerpoint=MS PowerPoint +labels.facet_filetype_odt=ODF Word +labels.facet_filetype_ods=ODF Spreadsheet +labels.facet_filetype_odp=ODP Presentation +labels.facet_filetype_pdf=PDF +labels.facet_filetype_fb2=FictionBook +labels.facet_filetype_epub=EPUB +labels.facet_filetype_ibooks=iBooks labels.facet_filetype_others=Others labels.facet_label_reset=Reset labels.searchoptions_all=All diff --git a/src/main/resources/fess_label_ja.properties b/src/main/resources/fess_label_ja.properties index 0cd852df7..d143dc101 100644 --- a/src/main/resources/fess_label_ja.properties +++ b/src/main/resources/fess_label_ja.properties @@ -220,10 +220,16 @@ labels.facet_contentLength_500kto1m=500KB - 1MB labels.facet_contentLength_1m=1MB -   labels.facet_filetype_title=\u30d5\u30a1\u30a4\u30eb\u306e\u7a2e\u985e labels.facet_filetype_html=HTML -labels.facet_filetype_word=Word -labels.facet_filetype_excel=Excel -labels.facet_filetype_powerpoint=PowerPoint +labels.facet_filetype_word=MS Word +labels.facet_filetype_excel=MS Excel +labels.facet_filetype_powerpoint=MS PowerPoint +labels.facet_filetype_odt=ODF Word +labels.facet_filetype_ods=ODF Spreadsheet +labels.facet_filetype_odp=ODP Presentation labels.facet_filetype_pdf=PDF +labels.facet_filetype_fb2=FictionBook +labels.facet_filetype_epub=EPUB +labels.facet_filetype_ibooks=iBooks labels.facet_filetype_others=\u305d\u306e\u4ed6 labels.facet_label_reset=\u30ea\u30bb\u30c3\u30c8 labels.searchoptions_all=\u3059\u3079\u3066 diff --git a/src/main/resources/fess_label_ru.properties b/src/main/resources/fess_label_ru.properties index 427f943d0..846925d71 100644 --- a/src/main/resources/fess_label_ru.properties +++ b/src/main/resources/fess_label_ru.properties @@ -224,15 +224,16 @@ labels.facet_contentLength_500kto1m=500kb - 1mb labels.facet_contentLength_1m=1mb -   labels.facet_filetype_title=Тип файла labels.facet_filetype_html=HTML -labels.facet_filetype_word=DOC (MS Word) -labels.facet_filetype_excel=XLS (MS Excel) -labels.facet_filetype_powerpoint=PPT (MS PowerPoint) -labels.facet_filetype_odt=ODT (OpenDocument Text) -labels.facet_filetype_odp=ODP (ODPresentation) -labels.facet_filetype_pdf=PDF (Portable Document Format) -labels.facet_filetype_pdf=FB2 (FictionBook) -labels.facet_filetype_pdf=EPUB (Electronic Publication) -labels.facet_filetype_pdf=IBOOKS (Apple) +labels.facet_filetype_word=MS Word +labels.facet_filetype_excel=MS Excel +labels.facet_filetype_powerpoint=MS PowerPoint +labels.facet_filetype_odt=ODF Word +labels.facet_filetype_ods=ODF Spreadsheet +labels.facet_filetype_odp=ODP Presentation +labels.facet_filetype_pdf=PDF +labels.facet_filetype_fb2=FictionBook +labels.facet_filetype_epub=EPUB +labels.facet_filetype_ibooks=iBooks labels.facet_filetype_others=Другие labels.facet_label_reset=Сброс labels.searchoptions_all=Все diff --git a/src/main/webapp/WEB-INF/crawler/resources/app.xml b/src/main/webapp/WEB-INF/crawler/resources/app.xml index 82ec8a181..727203955 100644 --- a/src/main/webapp/WEB-INF/crawler/resources/app.xml +++ b/src/main/webapp/WEB-INF/crawler/resources/app.xml @@ -81,6 +81,10 @@ "application/vnd.oasis.opendocument.text" "odt" + + "application/vnd.oasis.opendocument.spreadsheet" + "ods" + "application/vnd.oasis.opendocument.presentation" "odp"