diff --git a/src/main/java/org/codelibs/fess/taglib/FessFunctions.java b/src/main/java/org/codelibs/fess/taglib/FessFunctions.java index bb03059a0..dcf2e82c6 100644 --- a/src/main/java/org/codelibs/fess/taglib/FessFunctions.java +++ b/src/main/java/org/codelibs/fess/taglib/FessFunctions.java @@ -363,7 +363,7 @@ public class FessFunctions { return input.toString().replaceAll(regex, replacement); } - public static String formatCode(final String prefix, final String input, final String style) { + public static String formatCode(final String prefix, final String style, final String mimetype, final String input) { if (input == null) { return StringUtil.EMPTY; } diff --git a/src/main/webapp/WEB-INF/fe.tld b/src/main/webapp/WEB-INF/fe.tld index 5b0f9ef75..669a162f6 100644 --- a/src/main/webapp/WEB-INF/fe.tld +++ b/src/main/webapp/WEB-INF/fe.tld @@ -254,7 +254,7 @@ Format a content as code. formatCode org.codelibs.fess.taglib.FessFunctions - java.lang.String formatCode(java.lang.String, java.lang.String, java.lang.String) - ${fe:formatCode("L", doc.content_description, "prettyprint")} + java.lang.String formatCode(java.lang.String, java.lang.String, java.lang.String, java.lang.String) + ${fe:formatCode("L", "prettyprint", doc.mimetype, doc.content_description)} diff --git a/src/test/java/org/codelibs/fess/taglib/FessFunctionsTest.java b/src/test/java/org/codelibs/fess/taglib/FessFunctionsTest.java index 76ad90d8d..0b0ed11e7 100644 --- a/src/test/java/org/codelibs/fess/taglib/FessFunctionsTest.java +++ b/src/test/java/org/codelibs/fess/taglib/FessFunctionsTest.java @@ -65,39 +65,39 @@ public class FessFunctionsTest extends UnitFessTestCase { String value; code = ""; - value = FessFunctions.formatCode("L", code, "prettyprint"); + value = FessFunctions.formatCode("L", "prettyprint", "text/plain", code); assertEquals("
", value);
 
         code = "aaa";
-        value = FessFunctions.formatCode("L", code, "prettyprint");
+        value = FessFunctions.formatCode("L", "prettyprint", "text/plain", code);
         assertEquals("
aaa
", value); code = "aaa\nbbb"; - value = FessFunctions.formatCode("L", code, "prettyprint"); + value = FessFunctions.formatCode("L", "prettyprint", "text/plain", code); assertEquals("
aaa\nbbb
", value); code = "aaa\nbbb\nccc"; - value = FessFunctions.formatCode("L", code, "prettyprint"); + value = FessFunctions.formatCode("L", "prettyprint", "text/plain", code); assertEquals("
aaa\nbbb\nccc
", value); code = "L10:aaa"; - value = FessFunctions.formatCode("L", code, "prettyprint"); + value = FessFunctions.formatCode("L", "prettyprint", "text/plain", code); assertEquals("
aaa
", value); code = "L10:aaa\nL11:bbb"; - value = FessFunctions.formatCode("L", code, "prettyprint"); + value = FessFunctions.formatCode("L", "prettyprint", "text/plain", code); assertEquals("
aaa\nbbb
", value); code = "L10:aaa\nL11:bbb\nL12:ccc"; - value = FessFunctions.formatCode("L", code, "prettyprint"); + value = FessFunctions.formatCode("L", "prettyprint", "text/plain", code); assertEquals("
aaa\nbbb\nccc
", value); code = "aaa\nL11:bbb\nL12:ccc"; - value = FessFunctions.formatCode("L", code, "prettyprint"); + value = FessFunctions.formatCode("L", "prettyprint", "text/plain", code); assertEquals("
bbb\nccc
", value); code = "L10:aaa\nL11:bbb\nL12:ccc..."; - value = FessFunctions.formatCode("L", code, "prettyprint"); + value = FessFunctions.formatCode("L", "prettyprint", "text/plain", code); assertEquals("
aaa\nbbb
", value); }