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

[hategan at ci.uchicago.edu]

Author: hategan
Date: 2012-08-31 19:47:24 -0500 (Fri, 31 Aug 2012)
New Revision: 5914

Modified:
   trunk/src/org/griphyn/vdl/karajan/lib/swiftscript/ReadData.java
   trunk/src/org/griphyn/vdl/karajan/lib/swiftscript/ReadStructured.java
Log:
fixed readData and readStructured with field arguments (or any non-root arguments)

Modified: trunk/src/org/griphyn/vdl/karajan/lib/swiftscript/ReadData.java
===================================================================
--- trunk/src/org/griphyn/vdl/karajan/lib/swiftscript/ReadData.java	2012-08-28 21:42:21 UTC (rev 5913)
+++ trunk/src/org/griphyn/vdl/karajan/lib/swiftscript/ReadData.java	2012-09-01 00:47:24 UTC (rev 5914)
@@ -36,7 +36,6 @@
 import org.griphyn.vdl.mapping.AbsFile;
 import org.griphyn.vdl.mapping.AbstractDataNode;
 import org.griphyn.vdl.mapping.DSHandle;
-import org.griphyn.vdl.mapping.HandleOpenException;
 import org.griphyn.vdl.mapping.InvalidPathException;
 import org.griphyn.vdl.mapping.Path;
 import org.griphyn.vdl.mapping.PhysicalFormat;
@@ -62,7 +61,7 @@
 			readData(dest, (String) src.getValue());
 		}
 		else {
-			PhysicalFormat pf = src.getMapper().map(Path.EMPTY_PATH);
+			PhysicalFormat pf = src.getMapper().map(src.getPathFromRoot());
 			if (pf instanceof AbsFile) {
 				AbsFile af = (AbsFile) pf;
 				if (!af.getProtocol().equalsIgnoreCase("file")) {

Modified: trunk/src/org/griphyn/vdl/karajan/lib/swiftscript/ReadStructured.java
===================================================================
--- trunk/src/org/griphyn/vdl/karajan/lib/swiftscript/ReadStructured.java	2012-08-28 21:42:21 UTC (rev 5913)
+++ trunk/src/org/griphyn/vdl/karajan/lib/swiftscript/ReadStructured.java	2012-09-01 00:47:24 UTC (rev 5914)
@@ -57,7 +57,7 @@
 			readData(dest, (String) src.getValue());
 		}
 		else {
-			PhysicalFormat pf = src.getMapper().map(Path.EMPTY_PATH);
+			PhysicalFormat pf = src.getMapper().map(src.getPathFromRoot());
 			if (pf instanceof AbsFile) {
 				AbsFile af = (AbsFile) pf;
 				if (!af.getProtocol().equalsIgnoreCase("file")) {