Author: pierre
Date: 2009-05-04 14:43:14 +0200 (Mon, 04 May 2009)
New Revision: 34930
Modified:
mmbase/trunk/src/org/mmbase/datatypes/processors/xml/FieldGetString.java
mmbase/trunk/src/org/mmbase/datatypes/processors/xml/FieldSetString.java
Log:
fix issues with html postprocessing - remove standard behavior didn't create
proper xml
Modified:
mmbase/trunk/src/org/mmbase/datatypes/processors/xml/FieldGetString.java
===================================================================
--- mmbase/trunk/src/org/mmbase/datatypes/processors/xml/FieldGetString.java
2009-05-04 12:13:32 UTC (rev 34929)
+++ mmbase/trunk/src/org/mmbase/datatypes/processors/xml/FieldGetString.java
2009-05-04 12:43:14 UTC (rev 34930)
@@ -18,7 +18,6 @@
/**
-
* @see FieldSetString
* @author Michiel Meeuwissen
* @version $Id$
@@ -31,7 +30,7 @@
public Object process(Node node, Field field, Object value) {
- Object realValue = node.getObjectValue(field.getName());
+ Object realValue = node.getValueWithoutProcess(field.getName());
if (realValue == null || value == null) return "";
@@ -47,7 +46,12 @@
} else {
// requested something else, String, probably
try {
-
switch(Modes.getMode(node.getCloud().getProperty(Cloud.PROP_XMLMODE))) {
+ int mode = Modes.XML;
+ Object modeProperty =
node.getCloud().getProperty(Cloud.PROP_XMLMODE);
+ if (modeProperty != null) {
+ mode = Modes.getMode("" +
node.getCloud().getProperty(Cloud.PROP_XMLMODE));
+ }
+ switch(mode) {
case Modes.WIKI:
case Modes.KUPU:
case Modes.FLAT: {
Modified:
mmbase/trunk/src/org/mmbase/datatypes/processors/xml/FieldSetString.java
===================================================================
--- mmbase/trunk/src/org/mmbase/datatypes/processors/xml/FieldSetString.java
2009-05-04 12:13:32 UTC (rev 34929)
+++ mmbase/trunk/src/org/mmbase/datatypes/processors/xml/FieldSetString.java
2009-05-04 12:43:14 UTC (rev 34930)
@@ -35,7 +35,8 @@
public Object process(Node node, Field field, Object value) {
if (value instanceof org.w3c.dom.Document) return value;
log.debug("Getting " + field + " from " + node + " as a String");
- return Casting.toXML(PREF + Casting.toString(value) + POST);
+ return Casting.toXML(Casting.toString(value));
+// return Casting.toXML(PREF + Casting.toString(value) + POST);
}
}
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
