Changeset 33534

Timestamp:

Mar 15, 2012, 1:09:53 PM (14 years ago)

Author:

watersc1

Message:

Merge from trunk: The previous iteration on prioritizing science data over stare data did not work correctly. This version moves the ORDER BY dateobs statement into the elements of the union. I've also disabled the dateobs sorting that was done on the result of the union, as we no longer wish to do that (as it would undo the entire reason for the union).

Location:

tags/ipp-20120216/ippTools

Files:

• share/pztool_pendingimfile.sql (modified) (3 diffs)
• src/pztool.c (modified) (1 diff)

tags/ipp-20120216/ippTools/share/pztool_pendingimfile.sql

@@ -1 +1 @@
 SELECT *
 FROM (
-    SELECT
+    SELECT * FROM 
+    (SELECT
         summitImfile.*,
         summitExp.dateobs
@@ -20 +21 @@
         AND pzDownloadImfile.class_id IS NULL
         AND summitImfile.exp_name NOT LIKE '%a'
+    ORDER BY dateobs) AS partA
 UNION
-    SELECT
+    SELECT * FROM 
+    (SELECT
         summitImfile.*,
         summitExp.dateobs
@@ -40 +43 @@
         AND pzDownloadImfile.class_id IS NULL
         AND summitImfile.exp_name LIKE '%a'
+    ORDER BY dateobs) AS partB
 ) as Foo

tags/ipp-20120216/ippTools/src/pztool.c

@@ -338 +338 @@
         }
 
-        psStringAppend(&query, " ORDER BY dateobs");
-        if (desc) {
-            psStringAppend(&query, " DESC");
-        }
+/*         psStringAppend(&query, " ORDER BY dateobs"); */
+/*         if (desc) { */
+/*             psStringAppend(&query, " DESC"); */
+/*         } */
 
         // request the full "limit" from each known camera and throw away any