Changeset 24244 for branches/cnb_branches/cnb_branch_20090301/ippTools/share/magicdstool_getskycells.sql

Timestamp:

May 26, 2009, 1:59:32 PM (17 years ago)

Author:

beaumont

Message:

merged with trunk

Location:

branches/cnb_branches/cnb_branch_20090301

Files:

• . (modified) (1 prop)
• ippTools/share (modified) (1 prop)
• ippTools/share/magicdstool_getskycells.sql (modified) (2 diffs)

branches/cnb_branches/cnb_branch_20090301/ippTools/share

@@ -1 +1 @@
 Makefile.in
 Makefile
+pxadmin_create_mirror_tables.sql

@@ -1 +1 @@
 Makefile.in
 Makefile
+pxadmin_create_mirror_tables.sql

branches/cnb_branches/cnb_branch_20090301/ippTools/share/magicdstool_getskycells.sql

@@ -2 +2 @@
     diffSkyfile.diff_id,
     diffSkyfile.skycell_id,
-    diffSkyfile.uri,
     diffSkyfile.path_base
 FROM magicDSRun
 JOIN magicRun USING(magic_id)
-JOIN magicInputSkyfile USING(magic_id, diff_id)
+JOIN magicInputSkyfile USING(magic_id)
 JOIN diffSkyfile
-    ON magicInputSkyfile.diff_id = diffSkyfile.diff_id
+    ON magicRun.diff_id = diffSkyfile.diff_id
     AND magicInputSkyfile.node = diffSkyfile.skycell_id
 JOIN diffInputSkyfile
@@ -21 +20 @@
     ON warpSkyfile.warp_id = warpSkyCellMap.warp_id
     AND warpSkyfile.skycell_id = warpSkyCellMap.skycell_id
-    AND warpSkyfile.ignored = 0
+    AND warpSkyfile.quality = 0
 WHERE
     diffSkyfile.fault = 0
+    AND diffSkyfile.quality = 0
     AND magic_ds_id = %lld

@@ -1 +1 @@
 Makefile.in
 Makefile
+pxadmin_create_mirror_tables.sql