Changeset 30240 for trunk/ippTools/share

Timestamp:

Jan 12, 2011, 1:08:55 PM (16 years ago)

Author:

watersc1

Message:

updates and bugfixes to registration. Will test this afternoon.

Location:

trunk/ippTools/share

Files:

• regtool_checkburntoolimfile.sql (modified) (1 diff)
• regtool_pendingburntoolimfile.sql (modified) (1 diff)

trunk/ippTools/share/regtool_checkburntoolimfile.sql

@@ -16 +16 @@
        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 rawExp USING(exp_id, exp_name)
-            LEFT JOIN rawImfile USING(exp_name)
+       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 = rawExp.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'
-             AND (rawImfile.class_id = '@CLASS_ID@' OR rawImfile.class_id IS NULL)
+             summitExp.dateobs >= '@DATEOBS_BEGIN@'
+             AND summitExp.dateobs <= '@DATEOBS_END@'
+             AND summitImfile.class_id = '@CLASS_ID@'
              AND (exp_name <= '@EXP_NAME@')                                                                     
 ORDER BY summitExp.dateobs

trunk/ippTools/share/regtool_pendingburntoolimfile.sql

@@ -17 +17 @@
        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 = rawExp.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