Changeset 3592

Timestamp:

09/17/13 16:33:59 (11 years ago)

Author:

mwindhouwer

Message:

M module.xml
M org/isocat/sloot/accessor/ResolveArguments.java

• added an optional argument skip list
• by default sloot-operator is skipped
• zero or more skip arguments are allowed
• each skip argument is interpreted as a space seperated list of names of arguments to skip

Location:

cats/shared/urn.org.isocat.sloot/trunk

Files:

• module.xml (modified) (3 diffs)
• org/isocat/sloot/accessor/ResolveArguments.java (modified) (2 diffs)

cats/shared/urn.org.isocat.sloot/trunk/module.xml

@@ -20 +20 @@
          <rewrite>res:/pub/$1</rewrite>
       </fileset>
-      <!--<accessor>
+      <accessor>
          <id>sloot.dpml.resolve-arguments</id>
          <class>org.isocat.sloot.accessor.ResolveArguments</class>
@@ -26 +26 @@
             <active>
                <identifier>active:sloot.dpml.resolve-arguments</identifier>
+               <argument name="skip" min="0" max="*"/>
             </active>
          </grammar>
-      </accessor>-->
+      </accessor>
       <mapper>
          <config>
@@ -126 +127 @@
                </request>
             </endpoint>
-            <endpoint>
-               <grammar>
-                  <active>
-                     <identifier>active:sloot.dpml.resolve-arguments</identifier>
-                     <argument name="arguments">arg:arguments</argument>
-                  </active>
-               </grammar>
-               <request>
-                  <identifier>active:xslt2</identifier>
-                  <argument name="operator">res:/tools/resolve-dpml-args.xsl</argument>
-                  <argument name="operand">arg:arguments</argument>
-               </request>
-            </endpoint>
          </config>
          <space>

cats/shared/urn.org.isocat.sloot/trunk/org/isocat/sloot/accessor/ResolveArguments.java

@@ -24 +24 @@
 import org.netkernel.layer0.representation.impl.HDSBuilder;
 import org.netkernel.module.standard.endpoint.StandardAccessorImpl;
+import java.util.Arrays;
+import java.util.HashSet;
 
 public class ResolveArguments extends StandardAccessorImpl
@@ -32 +34 @@
 
         @Override
-        public void onSource(INKFRequestContext context) throws Exception
-        {  IHDSNode args = context.sourcePrimary(IHDSNode.class);
-           HDSBuilder builder = new HDSBuilder();
-           builder.pushNode("arguments");
-           for (IHDSNode arg : args.getNodes("/arguments/*"))
-           {  builder.addNode(arg.getName(),context.source((String)arg.getValue()));
+        public void onSource(INKFRequestContext aContext) throws Exception
+        {  HashSet<String> mSkipSet = new HashSet<String>();
+           if (aContext.getThisRequest().argumentExists("skip"))
+           {   for (String mSkip : aContext.getThisRequest().getArgumentValues("skip"))
+               {   mSkipSet.addAll(Arrays.asList(aContext.source(mSkip,String.class).split("\\s+")));
+               }
            }
-           context.createResponseFrom(builder.getRoot());
+           else
+           {   mSkipSet.add("sloot-operator");
+           }
+           IHDSNode mArgs = aContext.sourcePrimary(IHDSNode.class);
+           HDSBuilder mBuilder = new HDSBuilder();
+           mBuilder.pushNode("arguments");
+           for (IHDSNode mArg : mArgs.getNodes("/arguments/*"))
+           {   String mName = mArg.getName();
+               if (!mSkipSet.contains(mName))
+               {   mBuilder.addNode(mName,aContext.source((String)mArg.getValue()));
+               }
+           }
+           aContext.createResponseFrom(mBuilder.getRoot());
         }
 }