Index: trunk/tools/diff_inputs.pl
===================================================================
--- trunk/tools/diff_inputs.pl	(revision 21033)
+++ trunk/tools/diff_inputs.pl	(revision 21034)
@@ -59,7 +59,10 @@
     " FROM diffRun" .
     " JOIN diffInputSkyfile USING(diff_id)" .
-    " JOIN warpSkyfile USING(warp_id, skycell_id)" .
+    " JOIN warpSkyfile" .
+    "     ON warpSkyfile.skycell_id = diffInputSkyfile.skycell_id" .
+    "     AND (warpSkyfile.warp_id = diffInputSkyfile.warp1" .
+    "         OR warpSkyfile.warp_id = diffInputSkyfile.warp2)" .
     " WHERE diff_id = $diff_id";
-$sql .= " AND skycell_id = $skycell_id" if defined $skycell_id;
+$sql .= " AND diffInputSkyfile.skycell_id = $skycell_id" if defined $skycell_id;
 $sql.= " UNION" .
     " SELECT" .
@@ -68,7 +71,9 @@
     " FROM diffRun" .
     " JOIN diffInputSkyfile USING(diff_id)" .
-    " JOIN stackSumSkyfile USING(stack_id)" .
+    " JOIN stackSumSkyfile" .
+    "     ON (stackSumSkyfile.stack_id = diffInputSkyfile.stack1" .
+    "         OR stackSumSkyfile.stack_id = diffInputSkyfile.stack2)" .
     " WHERE diff_id = $diff_id";
-$sql .= " AND skycell_id = $skycell_id" if defined $skycell_id;
+$sql .= " AND diffInputSkyfile.skycell_id = $skycell_id" if defined $skycell_id;