[MMBASE CVS] src/org/mmbase/framework/basic BasicFramework.java BlockUrlConverter.java ChainedUrlConverter.java

[Michiel Meeuwissen]

Update of /var/cvs/src/org/mmbase/framework/basic
In directory james.mmbase.org:/tmp/cvs-serv844

Modified Files:
        BasicFramework.java BlockUrlConverter.java 
        ChainedUrlConverter.java 
Log Message:
MMB-1769


See also: http://cvs.mmbase.org/viewcvs/src/org/mmbase/framework/basic
See also: http://www.mmbase.org/jira/browse/MMB-1769


Index: BasicFramework.java
===================================================================
RCS file: /var/cvs/src/org/mmbase/framework/basic/BasicFramework.java,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -b -r1.41 -r1.42
--- BasicFramework.java 24 Nov 2008 20:18:13 -0000      1.41
+++ BasicFramework.java 5 Jan 2009 18:36:02 -0000       1.42
@@ -33,7 +33,7 @@
  * are configured is the order in which they are processed.
  *
  * @author Michiel Meeuwissen
- * @version $Id: BasicFramework.java,v 1.41 2008/11/24 20:18:13 michiel Exp $
+ * @version $Id: BasicFramework.java,v 1.42 2009/01/05 18:36:02 michiel Exp $
  * @since MMBase-1.9
  */
 public class BasicFramework extends Framework {
@@ -85,10 +85,12 @@
         HttpServletRequest request = 
BasicUrlConverter.getUserRequest(frameworkParameters.get(Parameter.REQUEST));
         State state = State.getState(request);
         frameworkParameters.set(ACTION, state.getId());
-        Url url = urlConverter.getUrl(path, parameters, frameworkParameters, 
escapeAmps);
+        Url url = urlConverter.getProcessUrl(path, parameters, 
frameworkParameters, escapeAmps);
         if (url == Url.NOT) {
-            return fallbackConverter.getUrl(path, parameters, 
frameworkParameters, escapeAmps).getUrl();
+            log.debug("Fall back url");
+            return fallbackConverter.getProcessUrl(path, parameters, 
frameworkParameters, escapeAmps).getUrl();
         } else {
+            log.debug("Url converter url " + url);
             return url.getUrl();
         }
     }


Index: BlockUrlConverter.java
===================================================================
RCS file: /var/cvs/src/org/mmbase/framework/basic/BlockUrlConverter.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- BlockUrlConverter.java      5 Jan 2009 17:49:48 -0000       1.15
+++ BlockUrlConverter.java      5 Jan 2009 18:36:02 -0000       1.16
@@ -25,7 +25,7 @@
  * URLConverters would probably like this, and can extend from this.
  *
  * @author Michiel Meeuwissen
- * @version $Id: BlockUrlConverter.java,v 1.15 2009/01/05 17:49:48 michiel Exp 
$
+ * @version $Id: BlockUrlConverter.java,v 1.16 2009/01/05 18:36:02 michiel Exp 
$
  * @since MMBase-1.9
  * @todo EXPERIMENTAL
  */
@@ -189,12 +189,14 @@
                 log.debug("" + niceUrl + " does not start with " + 
request.getServletPath());
             }
 
-            Map<String, Object> params = 
framework.prefix(getState(frameworkParameters),
+            Map<String, Object> params = action ? blockParameters.toMap() :
+                framework.prefix(getState(frameworkParameters),
                                                           
blockParameters.toMap());
             if (log.isDebugEnabled()) {
                 log.debug("Prefixed params " + params);
             }
             map.putAll(params);
+            if (action) map.put("_action", frameworkParameters.get("_action"));
 
             String u = BasicUrlConverter.getUrl(niceUrl.getUrl(), map, 
request, escapeAmps);
             log.debug("Returning actual url " + u);


Index: ChainedUrlConverter.java
===================================================================
RCS file: /var/cvs/src/org/mmbase/framework/basic/ChainedUrlConverter.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -b -r1.20 -r1.21
--- ChainedUrlConverter.java    29 Oct 2008 19:59:36 -0000      1.20
+++ ChainedUrlConverter.java    5 Jan 2009 18:36:02 -0000       1.21
@@ -28,7 +28,7 @@
  * outcome of a converter can be added to the outcome of its preceder.
  *
  * @author Andr&eacute; van Toly
- * @version $Id: ChainedUrlConverter.java,v 1.20 2008/10/29 19:59:36 michiel 
Exp $
+ * @version $Id: ChainedUrlConverter.java,v 1.21 2009/01/05 18:36:02 michiel 
Exp $
  * @since MMBase-1.9
  */
 public class ChainedUrlConverter implements UrlConverter {
@@ -156,6 +156,9 @@
                                 Map<String, Object> params,
                                 Parameters frameworkParameters, boolean 
escapeAmps) throws FrameworkException {
         Url result = Url.NOT;
+        if (log.isDebugEnabled()) {
+            log.debug("Producing process url " + path + " " + params + " " + 
frameworkParameters);
+        }
         for (UrlConverter uc : uclist) {
             Url proposal = getProposal(uc.getProcessUrl(path, params, 
frameworkParameters, escapeAmps), frameworkParameters);
             if (proposal.getWeight() > result.getWeight()) {
_______________________________________________
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs