[MMBASE CVS] applications/richtext/src/org/mmbase/richtext/processors/xml MmxfGetString.java

[Michiel Meeuwissen]

Update of /var/cvs/applications/richtext/src/org/mmbase/richtext/processors/xml
In directory 
james.mmbase.org:/tmp/cvs-serv10927/src/org/mmbase/richtext/processors/xml

Modified Files:
        MmxfGetString.java 
Log Message:
made only loading of relations default. related node itself is seldom necessary 
during editing.


See also: 
http://cvs.mmbase.org/viewcvs/applications/richtext/src/org/mmbase/richtext/processors/xml


Index: MmxfGetString.java
===================================================================
RCS file: 
/var/cvs/applications/richtext/src/org/mmbase/richtext/processors/xml/MmxfGetString.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- MmxfGetString.java  10 Jun 2008 15:46:11 -0000      1.15
+++ MmxfGetString.java  28 Oct 2008 09:59:47 -0000      1.16
@@ -30,13 +30,14 @@
  * This class implements the `get' for `mmxf' fields.
  *
  * @author Michiel Meeuwissen
- * @version $Id: MmxfGetString.java,v 1.15 2008/06/10 15:46:11 michiel Exp $
+ * @version $Id: MmxfGetString.java,v 1.16 2008/10/28 09:59:47 michiel Exp $
  * @since MMBase-1.8
  */
 
 public class MmxfGetString implements  Processor {
     public static String MODE_SHOWBROKEN    = 
"org.mmbase.richtext.wiki.show_broken";
     public static String MODE_LOADRELATIONS = 
"org.mmbase.richtext.wiki.load_relations";
+    public static String MODE_LOADRELATED   = 
"org.mmbase.richtext.wiki.load_related";
     public static String MODE_UNDECORATEIDS = 
"org.mmbase.richtext.wiki.undecorateids";
     public static String MODE_BRS           = "org.mmbase.richtext.wiki.brs";
 
@@ -79,7 +80,8 @@
         generator.add(node, field);
 
         Object loadRelations = node.getCloud().getProperty(MODE_LOADRELATIONS);
-        if (loadRelations == null || Casting.toBoolean(loadRelations)) {
+        Object loadRelated  = node.getCloud().getProperty(MODE_LOADRELATED);
+        if (loadRelated != null &&  Casting.toBoolean(loadRelated)) {
             org.mmbase.bridge.NodeList relatedNodes = 
node.getRelatedNodes("object", "idrel", "destination");
             if (log.isDebugEnabled()) {
                 log.debug("Idrelated " + relatedNodes);
@@ -90,6 +92,9 @@
                 log.debug("Idrelations " + relationsNodes);
             }
             generator.add(relationsNodes);
+        } else if (loadRelations == null || Casting.toBoolean(loadRelations)) {
+            org.mmbase.bridge.NodeList relationsNodes = 
node.getRelations("idrel", node.getCloud().getNodeManager("object"), 
"destination");
+            generator.add(relationsNodes);
         }
 
         // TODO. With advent of 'blocks' one deeper level must be queried here 
(see node.body.jspx)
_______________________________________________
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs