Changeset 30446 for branches/eam_branches/ipp-20101205/ippTools/share/regtool_pendingburntoolimfile.sql

Timestamp:

Jan 31, 2011, 2:51:48 PM (15 years ago)

Author:

eugene

Message:

merging changes from trunk

File:

• branches/eam_branches/ipp-20101205/ippTools/share/regtool_pendingburntoolimfile.sql (modified) (1 diff)

branches/eam_branches/ipp-20101205/ippTools/share/regtool_pendingburntoolimfile.sql

@@ -12 +12 @@
        newImfile.tmp_class_id,
        summitExp.exp_type,
-       rawExp.dateobs,
-       rawExp.obs_mode AS obs_mode,
-       rawExp.object AS object,
+       rawImfile.dateobs,
+       rawImfile.obs_mode AS obs_mode,
+       rawImfile.object AS object,
        rawImfile.burntool_state AS burntool_state,
        rawImfile.class_id,
+       summitImfile.class_id AS summit_class_id,
        (pzDownloadExp.state = 'stop') AS is_downloaded,
        (rawImfile.burntool_state IS NOT NULL) AS is_registered
        FROM
-            summitExp
-            LEFT JOIN pzDownloadExp USING(exp_name)
-            LEFT JOIN newExp ON exp_name = tmp_exp_name
-            LEFT JOIN newImfile USING(exp_id)
-            LEFT JOIN rawExp USING(exp_id, exp_name)
-            LEFT JOIN rawImfile ON (rawImfile.exp_name = newExp.tmp_exp_name AND rawImfile.tmp_class_id = newImfile.tmp_class_id)
+       summitExp
+       JOIN summitImfile USING(exp_name)
+       LEFT JOIN pzDownloadExp USING(exp_name)
+       LEFT JOIN newExp ON summitExp.exp_name = tmp_exp_name
+       LEFT JOIN newImfile ON (summitImfile.class_id = newImfile.tmp_class_id AND newExp.exp_id = newImfile.exp_id)
+       LEFT JOIN rawExp ON rawExp.exp_id = newExp.exp_id
+       LEFT JOIN rawImfile ON (rawImfile.exp_id = newExp.exp_id AND rawImfile.tmp_class_id = newImfile.tmp_class_id)
        WHERE
-             summitExp.dateobs >= '@DATE@T00:00:00'
-             AND summitExp.dateobs <= '@DATE@T23:59:59'
-ORDER BY newImfile.tmp_class_id,summitExp.dateobs
+             summitExp.dateobs >= '@DATEOBS_BEGIN@'
+             AND summitExp.dateobs <= '@DATEOBS_END@'
+ORDER BY summitImfile.class_id,summitExp.dateobs