[MMBASE SCM] r41341 - mmbase/branches/MMBase-1_8/applications/jumpers/src/org/mmbase/jumpers

[michiel]

Author: michiel
Date: 2010-03-11 14:24:22 +0100 (Thu, 11 Mar 2010)
New Revision: 41341

Modified:
   
mmbase/branches/MMBase-1_8/applications/jumpers/src/org/mmbase/jumpers/Jumpers.java
Log:
added reload paraometer to jump function

Modified: 
mmbase/branches/MMBase-1_8/applications/jumpers/src/org/mmbase/jumpers/Jumpers.java
===================================================================
--- 
mmbase/branches/MMBase-1_8/applications/jumpers/src/org/mmbase/jumpers/Jumpers.java
 2010-03-11 12:20:21 UTC (rev 41340)
+++ 
mmbase/branches/MMBase-1_8/applications/jumpers/src/org/mmbase/jumpers/Jumpers.java
 2010-03-11 13:24:22 UTC (rev 41341)
@@ -71,10 +71,14 @@
         };
     {
         jumpCache.putCache();
-        addFunction(new AbstractFunction("jump", new Parameter[] {new 
Parameter("key", String.class, true) }, ReturnType.STRING) {
+        addFunction(new AbstractFunction("jump", new Parameter[] {
+                    new Parameter("key", String.class, true),
+                    new Parameter("reload", Boolean.class, Boolean.FALSE)
+                }, ReturnType.STRING) {
                 public String getFunctionValue(Parameters parameters) {
                     String key = parameters.getString("key");
-                    return getJump(key);
+                    boolean reload = 
org.mmbase.util.Casting.toBoolean(parameters.get("reload"));
+                    return getJump(key, reload);
                 }
             });
     }
@@ -234,11 +238,11 @@
      * @return the found alternate url.
      */
     public String getJump(StringTokenizer tok) {
-        return getJump(tok,false);
+        return getJump(tok, false);
     }
     public String getJump(StringTokenizer tok, boolean reload) {
         String key = tok.nextToken();
-        return getJump(key,reload);
+        return getJump(key, reload);
     }
 
     public String getJump(String key){
@@ -392,7 +396,9 @@
             if (url == null) {
                 // no direct url call its builder
                 if (ikey >= 0) {
-                    url = jumperDatabaseCache_get(key);
+                    if (! reload) {
+                        url = jumperDatabaseCache_get(key);
+                    }
                     if (url == null) {
                         MMObjectNode node = getNode(ikey);
                         if (node != null) {

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