Index: trunk/ippTools/src/warptool.c
===================================================================
--- trunk/ippTools/src/warptool.c	(revision 10772)
+++ trunk/ippTools/src/warptool.c	(revision 11138)
@@ -104,4 +104,14 @@
     }
 
+    psString workdir = psMetadataLookupStr(&status, config->args, "-workdir");
+    if (!status) {
+        psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -workdir");
+        return false;
+    }
+    if (!workdir) {
+        psError(PS_ERR_UNKNOWN, true, "-workdir is required");
+        return false;
+    }
+
     psString filter = psMetadataLookupStr(&status, config->args, "-filter");
     if (!status) {
@@ -188,4 +198,5 @@
             survey_mode,
             "run",
+            workdir,
             filter,
             skycell_id,
@@ -292,5 +303,6 @@
         " SELECT DISTINCT"
         "   p4InputImfile.p4_id,"
-        "   p2ProcessedImfile.*"
+        "   p2ProcessedImfile.*,"
+        "   p4Run.workdir"
         " FROM p4Run"
         " JOIN p4InputImfile"
@@ -507,5 +519,6 @@
     psString query = psStringCopy(
         " SELECT DISTINCT"
-        "   p4WarpedImfile.*"
+        "   p4WarpedImfile.*,"
+        "   p4Run.workdir"
         " FROM p4Run"
         " JOIN p4WarpedImfile"
@@ -695,5 +708,6 @@
         " SELECT DISTINCT"
         "   p4StackedImfile.*,"
-        "   p4WarpedImfile.uri as warped_uri"
+        "   p4WarpedImfile.uri as warped_uri,"
+        "   p4Run.workdir"
         " FROM p4Run"
         " JOIN p4StackedImfile"