[Swift-commit] r3561 - trunk/src/org/griphyn/vdl/karajan/lib

[noreply at svn.ci.uchicago.edu]

Author: hategan
Date: 2010-08-23 00:26:28 -0500 (Mon, 23 Aug 2010)
New Revision: 3561

Modified:
   trunk/src/org/griphyn/vdl/karajan/lib/OutFileDirs.java
   trunk/src/org/griphyn/vdl/karajan/lib/OutFiles.java
Log:
fixed improper path parsing

Modified: trunk/src/org/griphyn/vdl/karajan/lib/OutFileDirs.java
===================================================================
--- trunk/src/org/griphyn/vdl/karajan/lib/OutFileDirs.java	2010-08-22 03:35:05 UTC (rev 3560)
+++ trunk/src/org/griphyn/vdl/karajan/lib/OutFileDirs.java	2010-08-23 05:26:28 UTC (rev 3561)
@@ -11,12 +11,11 @@
 import org.globus.cog.karajan.stack.VariableStack;
 import org.globus.cog.karajan.util.TypeUtil;
 import org.globus.cog.karajan.workflow.ExecutionException;
-import org.globus.cog.karajan.workflow.nodes.AbstractSequentialWithArguments;
 import org.griphyn.vdl.mapping.AbsFile;
 import org.griphyn.vdl.mapping.DSHandle;
 import org.griphyn.vdl.mapping.Path;
 
-public class OutFileDirs extends AbstractSequentialWithArguments {
+public class OutFileDirs extends VDLFunction {
     public static final Arg STAGEOUTS = new Arg.Positional("stageouts");
 
     static {
@@ -24,13 +23,13 @@
     }
 
     @Override
-    protected void post(VariableStack stack) throws ExecutionException {
+    public Object function(VariableStack stack) throws ExecutionException {
         List files = TypeUtil.toList(STAGEOUTS.getValue(stack));
         VariableArguments ret = ArgUtil.getVariableReturn(stack);
         try {
             for (Object f : files) {
                 List pv = TypeUtil.toList(f);
-                Path p = Path.parse(TypeUtil.toString(pv.get(0)));
+                Path p = parsePath(pv.get(0), stack);
                 DSHandle handle = (DSHandle) pv.get(1);
                 DSHandle leaf = handle.getField(p);
                 String fname = VDLFunction.filename(leaf)[0];
@@ -41,6 +40,6 @@
         catch (Exception e) {
             throw new ExecutionException(e);
         }
-        super.post(stack);
+        return null;
     }
 }

Modified: trunk/src/org/griphyn/vdl/karajan/lib/OutFiles.java
===================================================================
--- trunk/src/org/griphyn/vdl/karajan/lib/OutFiles.java	2010-08-22 03:35:05 UTC (rev 3560)
+++ trunk/src/org/griphyn/vdl/karajan/lib/OutFiles.java	2010-08-23 05:26:28 UTC (rev 3561)
@@ -30,7 +30,7 @@
         try {
             for (Object f : files) {
                 List pv = TypeUtil.toList(f);
-                Path p = Path.parse(TypeUtil.toString(pv.get(0)));
+                Path p = parsePath(pv.get(0), stack);
                 DSHandle handle = (DSHandle) pv.get(1);
                 DSHandle leaf = handle.getField(p);
                 String fname = argList(VDLFunction.filename(leaf), true);