Update of /var/cvs/applications/richtext/src/org/mmbase/richtext/processors/xml
In directory
james.mmbase.org:/tmp/cvs-serv25148/src/org/mmbase/richtext/processors/xml
Modified Files:
MmxfSetString.java
Log Message:
Made also 'wiki' syntax understand br's
See also:
http://cvs.mmbase.org/viewcvs/applications/richtext/src/org/mmbase/richtext/processors/xml
Index: MmxfSetString.java
===================================================================
RCS file:
/var/cvs/applications/richtext/src/org/mmbase/richtext/processors/xml/MmxfSetString.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -b -r1.19 -r1.20
--- MmxfSetString.java 25 Mar 2008 18:00:14 -0000 1.19
+++ MmxfSetString.java 22 Apr 2008 11:16:59 -0000 1.20
@@ -24,7 +24,7 @@
* Set-processing for an `mmxf' field. This is the counterpart and inverse of
[EMAIL PROTECTED] MmxfGetString}, for more
* information see the javadoc of that class.
* @author Michiel Meeuwissen
- * @version $Id: MmxfSetString.java,v 1.19 2008/03/25 18:00:14 michiel Exp $
+ * @version $Id: MmxfSetString.java,v 1.20 2008/04/22 11:16:59 michiel Exp $
* @since MMBase-1.8
*/
@@ -34,6 +34,7 @@
private static XmlField xmlField = new XmlField(XmlField.WIKI);
+ private static XmlField xmlFieldBrs = new XmlField(XmlField.WIKIBRS);
private static Kupu kupu = new Kupu();
private static DocBook docbook = new DocBook();
private static Wiki wiki = new Wiki();
@@ -53,8 +54,14 @@
return kupu.parse(node, Util.parse(value));
}
case Modes.WIKI: {
- log.debug("Handling wiki-input: " + value);
- return wiki.parse(node,
Util.parse(xmlField.transformBack(Util.toString(value))));
+ if (log.isTraceEnabled()) {
+ log.trace("Handling wiki-input: " + value);
+ }
+ String xml = xmlFieldBrs.transformBack(Util.toString(value));
+ if (log.isDebugEnabled()) {
+ log.debug("XML: " + xml);
+ }
+ return wiki.parse(node, Util.parse(xml));
}
case Modes.DOCBOOK: {
log.debug("Handling docbook-input: " + value);
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
