Update of /var/cvs/contributions/didactor2/src/core/java/nl/didactor/filter
In directory james.mmbase.org:/tmp/cvs-serv8782

Modified Files:
        DidactorUrlConverter.java 
Log Message:
The blocks parameters where still ignored


See also: 
http://cvs.mmbase.org/viewcvs/contributions/didactor2/src/core/java/nl/didactor/filter


Index: DidactorUrlConverter.java
===================================================================
RCS file: 
/var/cvs/contributions/didactor2/src/core/java/nl/didactor/filter/DidactorUrlConverter.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- DidactorUrlConverter.java   8 Aug 2008 13:42:06 -0000       1.3
+++ DidactorUrlConverter.java   8 Aug 2008 16:01:17 -0000       1.4
@@ -19,7 +19,7 @@
 
  *
  * @author Michiel Meeuwissen
- * @version $Id: DidactorUrlConverter.java,v 1.3 2008/08/08 13:42:06 michiel 
Exp $
+ * @version $Id: DidactorUrlConverter.java,v 1.4 2008/08/08 16:01:17 michiel 
Exp $
  */
 public class DidactorUrlConverter implements 
org.mmbase.framework.basic.UrlConverter {
     private static final Logger log = 
Logging.getLoggerInstance(DidactorUrlConverter.class);
@@ -64,8 +64,13 @@
                     b.append(block.getName());
                     b.append('/');
                 }
+                if (action) {
                 return b.toString();
             } else {
+                    return  
org.mmbase.framework.basic.BasicUrlConverter.getUrl(b.toString(), parameters , 
request, escapeAmps);
+                }
+
+            } else {
                 log.debug("No block found");
                 return null;
             }
@@ -109,7 +114,6 @@
                 }
                 log.debug("Putting on request " + value + " -> " + 
request.getAttribute(value));
                 request.setAttribute("node", request.getAttribute(value));
-                request.setAttribute(Framework.COMPONENT_INCLUDEPATH_KEY, 
request.getAttribute("includePath"));
 
                 result.append("?name=");
                 result.append(component.getName());
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs

Reply via email to