[MMBASE SCM] r42171 - in speeltuin/mihxil/simple/src/main: java/org/meeuw webapp/WEB-INF/config

[michiel]

Author: michiel
Date: 2010-05-16 19:17:25 +0200 (Sun, 16 May 2010)
New Revision: 42171

Modified:
   speeltuin/mihxil/simple/src/main/java/org/meeuw/SimpleUrlConverter.java
   speeltuin/mihxil/simple/src/main/webapp/WEB-INF/config/framework.xml
Log:


Modified: 
speeltuin/mihxil/simple/src/main/java/org/meeuw/SimpleUrlConverter.java
===================================================================
--- speeltuin/mihxil/simple/src/main/java/org/meeuw/SimpleUrlConverter.java     
2010-05-16 17:17:13 UTC (rev 42170)
+++ speeltuin/mihxil/simple/src/main/java/org/meeuw/SimpleUrlConverter.java     
2010-05-16 17:17:25 UTC (rev 42171)
@@ -33,9 +33,11 @@
 
     private static final Parameter[] DEF = new Parameter[] {Parameter.REQUEST, 
Framework.N};
 
-    private static CharTransformer trans = new Identifier();
+    private final Identifier trans = new Identifier();
+
     private String nodeManager = "segments";
     private String postfix = "/";
+    private String space = "-";
 
     public SimpleUrlConverter(BasicFramework fw) {
     }
@@ -45,12 +47,17 @@
     }
 
     /**
-     * Postfix for pages. Defaults to ''. But also '.html' would be a nice 
possibility.
+     * Postfix for pages. Defaults to '/'. But also '.html' would be a nice 
possibility. Second one is best for wgetting. First one works well when
+     * welcome file replacement is used too (for serving with apache)
      */
     public void setPostfix(String pf) {
         postfix = pf;
     }
 
+    public void setSpace(String s) {
+        trans.setWhitespaceReplacer(s);
+    }
+
     @Override
     public int getDefaultWeight() {
         return 1000;
@@ -112,7 +119,7 @@
             Cloud cloud = 
ContextProvider.getDefaultCloudContext().getCloud("mmbase");
             NodeManager nm = cloud.getNodeManager(nodeManager);
             NodeQuery q = nm.createQuery();
-            String like = StringUtils.removeEnd(p[1], postfix);
+            String like = StringUtils.removeEnd(p[1], 
postfix).replaceAll(trans.getWhitespaceReplacer(), "_");;
             Constraint cons = Queries.createConstraint(q, "title", 
Queries.getOperator("LIKE"), like);
             q.setCaseSensitive((FieldConstraint) cons, false);
             Queries.addConstraint(q, cons);

Modified: speeltuin/mihxil/simple/src/main/webapp/WEB-INF/config/framework.xml
===================================================================
--- speeltuin/mihxil/simple/src/main/webapp/WEB-INF/config/framework.xml        
2010-05-16 17:17:13 UTC (rev 42170)
+++ speeltuin/mihxil/simple/src/main/webapp/WEB-INF/config/framework.xml        
2010-05-16 17:17:25 UTC (rev 42171)
@@ -21,7 +21,8 @@
   </urlconverter>
 
   <urlconverter class="org.meeuw.SimpleUrlConverter">
-
+    <param name="postfix">/</param>
+    <param name="space">-</param>
   </urlconverter>
 
 

_______________________________________________
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs