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

[Michiel Meeuwissen]

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

Modified Files:
        BasicFramework.java BasicUrlConverter.java 
Log Message:



See also: http://cvs.mmbase.org/viewcvs/src/org/mmbase/framework/basic


Index: BasicFramework.java
===================================================================
RCS file: /var/cvs/src/org/mmbase/framework/basic/BasicFramework.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- BasicFramework.java 22 Feb 2008 14:05:57 -0000      1.10
+++ BasicFramework.java 23 Feb 2008 14:36:30 -0000      1.11
@@ -30,7 +30,7 @@
  * configured with an XML 'framework.xml'.
  *
  * @author Michiel Meeuwissen
- * @version $Id: BasicFramework.java,v 1.10 2008/02/22 14:05:57 michiel Exp $
+ * @version $Id: BasicFramework.java,v 1.11 2008/02/23 14:36:30 michiel Exp $
  * @since MMBase-1.9
  */
 public class BasicFramework extends Framework {
@@ -279,7 +279,7 @@
     protected String getPrefix(final State state) {
         //return "_" + renderer.getBlock().getComponent().getName() + "_" +
         //renderer.getBlock().getName() + "_" + count + "_";
-        return "_" + state.getId();
+        return "_" + state.getId() + ":";
     }
     protected Map<String, Object> getMap(final State state, final Map<String, 
Object> params) {
         return new AbstractMap<String, Object>() {


Index: BasicUrlConverter.java
===================================================================
RCS file: /var/cvs/src/org/mmbase/framework/basic/BasicUrlConverter.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- BasicUrlConverter.java      23 Feb 2008 13:46:11 -0000      1.8
+++ BasicUrlConverter.java      23 Feb 2008 14:36:30 -0000      1.9
@@ -25,7 +25,7 @@
  *
  *
  * @author Michiel Meeuwissen
- * @version $Id: BasicUrlConverter.java,v 1.8 2008/02/23 13:46:11 michiel Exp $
+ * @version $Id: BasicUrlConverter.java,v 1.9 2008/02/23 14:36:30 michiel Exp $
  * @since MMBase-1.9
  */
 public final class BasicUrlConverter implements UrlConverter {
@@ -51,16 +51,10 @@
             page = page.replaceAll("&", "&amp;");
         }
         if (page == null || page.equals("")) { // means _this_ page
-            String requestURI = req.getRequestURI();
-            if (requestURI.endsWith("/")) {
-                page = ".";
-            } else {
-                page = new File(requestURI).getName();
-            }
-            //page = FrameworkFilter.getPath(req); No good, it will produce 
something which starts
+            page = FrameworkFilter.getPath(req); //No good, it will produce 
something which starts
             //with /, which at least is not what mm:url wants in this case.
 
-            log.debug("page not given, -> supposing it " + page);
+            log.debug("page not given, -> supposing it " + page + " 
determined");
         }
         show.append(page);
 
@@ -111,7 +105,7 @@
         State state = State.getState(request);
         Map<String, Object> map = new TreeMap<String, Object>();
         if (log.isDebugEnabled()) {
-            log.debug("path " + path + " " + parameters + " " + 
frameworkParameters);
+            log.debug("path '" + path + "' " + parameters + " " + 
frameworkParameters);
         }
         for (Map.Entry<String, Object> e : parameters.entrySet()) {
             map.put(e.getKey(), e.getValue());
@@ -122,8 +116,7 @@
                 Map.Entry<String, String[]> entry = (Map.Entry<String, 
String[]>) e;
 
                 String k = entry.getKey();
-                // TODO: this is ad hoc (and incorrect if more than 9 blocks)
-                if (k.startsWith("_" + state.getId())) {
+                if (k.startsWith(framework.getPrefix(state))) {
                     // for this block, don't add that,
                     // because should be in parameters then
                     continue;
_______________________________________________
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs