[Swift-commit] r2089 - in trunk: libexec src/org/griphyn/vdl/karajan/lib

[noreply at svn.ci.uchicago.edu]

Author: benc
Date: 2008-07-07 07:39:21 -0500 (Mon, 07 Jul 2008)
New Revision: 2089

Added:
   trunk/src/org/griphyn/vdl/karajan/lib/IsFileBound.java
Removed:
   trunk/src/org/griphyn/vdl/karajan/lib/IsDatasetBound.java
Modified:
   trunk/libexec/vdl-lib.xml
   trunk/libexec/vdl.k
Log:
relabel isDatasetBound to isFileBound, ready to introduce datasets that are not bound to files.

Modified: trunk/libexec/vdl-lib.xml
===================================================================
--- trunk/libexec/vdl-lib.xml	2008-07-07 12:36:26 UTC (rev 2088)
+++ trunk/libexec/vdl-lib.xml	2008-07-07 12:39:21 UTC (rev 2089)
@@ -45,7 +45,7 @@
 	<export name="getFieldSubscript"><elementDef classname="org.griphyn.vdl.karajan.lib.GetFieldSubscript"/></export>
 	<export name="setFieldValue"><elementDef classname="org.griphyn.vdl.karajan.lib.SetFieldValue"/></export>
 	<export name="getFieldValue"><elementDef classname="org.griphyn.vdl.karajan.lib.GetFieldValue"/></export>
-	<export name="isDatasetBound"><elementDef classname="org.griphyn.vdl.karajan.lib.IsDatasetBound"/></export>
+	<export name="isFileBound"><elementDef classname="org.griphyn.vdl.karajan.lib.IsFileBound"/></export>
 	<export name="fileSet"><elementDef classname="org.griphyn.vdl.karajan.lib.FileSet"/></export>
 	<export name="fringePaths"><elementDef classname="org.griphyn.vdl.karajan.lib.FringePaths"/></export>
 	<export name="assign"><elementDef classname="org.griphyn.vdl.karajan.lib.Assign"/></export>

Modified: trunk/libexec/vdl.k
===================================================================
--- trunk/libexec/vdl.k	2008-07-07 12:36:26 UTC (rev 2088)
+++ trunk/libexec/vdl.k	2008-07-07 12:39:21 UTC (rev 2089)
@@ -54,7 +54,7 @@
 
 		element(stagein, [var]
 			if(
-				vdl:isDatasetBound(var) try(
+				vdl:isFileBound(var) try(
 					sequential(
 						fp := vdl:fringePaths(var)
 						try (
@@ -87,7 +87,7 @@
 
 		element(stageout, [var]
 			try(
-				if(vdl:isDatasetBound(var) 
+				if(vdl:isFileBound(var) 
 					channel:to(stageout,
 						for(path, vdl:fringePaths(var)
 							list(path, var)

Deleted: trunk/src/org/griphyn/vdl/karajan/lib/IsDatasetBound.java
===================================================================
--- trunk/src/org/griphyn/vdl/karajan/lib/IsDatasetBound.java	2008-07-07 12:36:26 UTC (rev 2088)
+++ trunk/src/org/griphyn/vdl/karajan/lib/IsDatasetBound.java	2008-07-07 12:39:21 UTC (rev 2089)
@@ -1,27 +0,0 @@
-/*
- * Created on Dec 26, 2006
- */
-package org.griphyn.vdl.karajan.lib;
-
-import org.globus.cog.karajan.arguments.Arg;
-import org.globus.cog.karajan.stack.VariableStack;
-import org.globus.cog.karajan.workflow.ExecutionException;
-import org.griphyn.vdl.mapping.AbstractDataNode;
-import org.griphyn.vdl.mapping.DSHandle;
-
-public class IsDatasetBound extends VDLFunction {
-	static {
-		setArguments(IsDatasetBound.class, new Arg[] { PA_VAR });
-	}
-
-	public Object function(VariableStack stack) throws ExecutionException {
-		DSHandle var = (DSHandle) PA_VAR.getValue(stack);
-		if (var instanceof AbstractDataNode) {
-			return Boolean.valueOf(!((AbstractDataNode) var).isPrimitive());
-		}
-		else {
-			return Boolean.FALSE;
-		}
-	}
-
-}

Added: trunk/src/org/griphyn/vdl/karajan/lib/IsFileBound.java
===================================================================
--- trunk/src/org/griphyn/vdl/karajan/lib/IsFileBound.java	                        (rev 0)
+++ trunk/src/org/griphyn/vdl/karajan/lib/IsFileBound.java	2008-07-07 12:39:21 UTC (rev 2089)
@@ -0,0 +1,27 @@
+/*
+ * Created on Dec 26, 2006
+ */
+package org.griphyn.vdl.karajan.lib;
+
+import org.globus.cog.karajan.arguments.Arg;
+import org.globus.cog.karajan.stack.VariableStack;
+import org.globus.cog.karajan.workflow.ExecutionException;
+import org.griphyn.vdl.mapping.AbstractDataNode;
+import org.griphyn.vdl.mapping.DSHandle;
+
+public class IsFileBound extends VDLFunction {
+	static {
+		setArguments(IsFileBound.class, new Arg[] { PA_VAR });
+	}
+
+	public Object function(VariableStack stack) throws ExecutionException {
+		DSHandle var = (DSHandle) PA_VAR.getValue(stack);
+		if (var instanceof AbstractDataNode) {
+			return Boolean.valueOf(!((AbstractDataNode) var).isPrimitive());
+		}
+		else {
+			return Boolean.FALSE;
+		}
+	}
+
+}