Changeset 29515 for branches/eam_branches/ipp-20100823/ippTools/share/difftool_listrun.sql

Timestamp:

Oct 21, 2010, 2:45:13 PM (16 years ago)

Author:

eugene

Message:

merge changes from trunk

File:

• branches/eam_branches/ipp-20100823/ippTools/share/difftool_listrun.sql (modified) (3 diffs)

branches/eam_branches/ipp-20100823/ippTools/share/difftool_listrun.sql

@@ -12 +12 @@
     diffRun.bothways,
     warp1,
-    stack1,
     warp2,
-    stack2,
     -- The following are only valid for warps
     -- XXX This needs to be more clever to handle diffs between stacks
@@ -27 +25 @@
     rawInput.exp_name AS exp_name_1,
     rawInput.exp_id AS exp_id_1,
+    rawInput.comment AS comment_1,
+    rawInput.dateobs AS dateobs_1,
     chipInput.chip_id AS chip_id_1,
     camInput.cam_id AS cam_id_1,
@@ -34 +34 @@
     rawTemplate.exp_name AS exp_name_2,
     rawTemplate.exp_id AS exp_id_2,
+    rawTemplate.comment AS comment_2,
+    rawTemplate.dateobs AS dateobs_2,
     chipTemplate.chip_id AS chip_id_2,
     camTemplate.cam_id AS cam_id_2,