Changeset 35955 for trunk/ippTools

Timestamp:

Aug 15, 2013, 1:29:16 PM (13 years ago)

Author:

bills

Message:

add state = 'skycal' to stages supported by disttool

Location:

trunk/ippTools

Files:

• share/Makefile.am (modified) (2 diffs)
• share/disttool_definebyquery_skycal.sql (added)
• share/disttool_pending_skycal.sql (added)
• src/disttool.c (modified) (1 diff)
• src/pstamptool.c (modified) (1 diff)

trunk/ippTools/share/Makefile.am

@@ -193 +193 @@
         disttool_definebyquery_sky.sql \
         disttool_definebyquery_sky_singlefilter.sql \
+        disttool_definebyquery_skycal.sql \
         disttool_definebyquery_stack.sql \
         disttool_definebyquery_warp.sql \
@@ -207 +208 @@
         disttool_pending_raw.sql \
         disttool_pending_sky.sql \
+        disttool_pending_skycal.sql \
         disttool_pending_stack.sql \
         disttool_pending_warp.sql \

trunk/ippTools/src/disttool.c

@@ -375 +375 @@
         }
         if (dist_group) {
-            psStringAppend(&query, " AND (sticskyRun.dist_group = '%s')", dist_group);
+            psStringAppend(&query, " AND (staticskyRun.dist_group = '%s')", dist_group);
         }
         // (static)sky stage doesn't require magic
+        magic = false;
+    } else if (!strcmp(stage, "skycal")) {
+        query = pxDataGet("disttool_definebyquery_skycal.sql");
+        if (!query) {
+            psError(PXTOOLS_ERR_SYS, false, "failed to retreive SQL statement");
+            psFree(where);
+            return false;
+        }
+
+        if (label) {
+            psStringAppend(&query, " AND (skycalRun.label = '%s')", label);
+        }
+        if (dist_group) {
+            psStringAppend(&query, " AND (skycalRun.dist_group = '%s')", dist_group);
+        }
+        // skycal stage doesn't require magic
         magic = false;
     } else if (!strcmp(stage, "SSdiff")) {

trunk/ippTools/src/pstamptool.c

@@ -1428 +1428 @@
     psFree(where);
 
-    psStringAppend(&query, " ORDER BY priority DESC, req_id, dep_id");
+    psStringAppend(&query, " GROUP BY dep_id ORDER BY priority DESC, MIN(req_id), dep_id");
 
     // treat limit == 0 as "no limit"