Changeset 28339

Timestamp:

Jun 15, 2010, 1:57:07 PM (16 years ago)

Author:

bills

Message:

implement ordering by Label.priority for camtool -processedexp
Needed to stop sharing the sql to implement this

Location:

trunk/ippTools

Files:

• share/Makefile.am (modified) (1 diff)
• share/camtool_pendingexp.sql (moved) (moved from trunk/ippTools/share/camtool_find_pendingexp.sql ) (3 diffs)
• src/camtool.c (modified) (3 diffs)

trunk/ippTools/share/Makefile.am

@@ -18 +18 @@
      addtool_revertminidvodbprocessed.sql \
      addtool_revertprocessedexp.sql \
+     camtool_addprocessedexp.sql \
      camtool_donecleanup.sql \
      camtool_find_chip_id.sql \
-     camtool_find_pendingexp.sql \
+     camtool_pendingexp.sql \
      camtool_find_pendingimfile.sql \
      camtool_find_processedexp.sql \

trunk/ippTools/share/camtool_pendingexp.sql

@@ -1 @@
--- this query is used by both camtool -pendingexp & camtool -addprocessedexp it
--- does a little more work then is necessary for -addprocessed but it seems
--- "cleaner" to use the same query for both cases 
 SELECT
     camRun.*,
@@ -11 +8 @@
     rawExp.filelevel,
     chipRun.magicked AS chip_magicked,
-    camProcessedExp.path_base
+    camProcessedExp.path_base,
+    IFNULL(Label.priority, 10000) AS priority
 FROM camRun
 JOIN chipRun
@@ -21 +19 @@
 LEFT JOIN camMask
     ON camRun.label = camMask.label
+LEFT JOIN Label
+    ON camRun.label = Label.label
 WHERE
     chipRun.state = 'full'
     AND ((camRun.state = 'new' AND camProcessedExp.cam_id IS NULL) OR camRun.state = 'update')
     AND camMask.label IS NULL
+    AND (Label.active OR Label.active IS NULL)

trunk/ippTools/src/camtool.c

@@ -292 +292 @@
     PXOPT_LOOKUP_BOOL(simple, config->args, "-simple", false);
 
-    psString query = pxDataGet("camtool_find_pendingexp.sql");
+    psString query = pxDataGet("camtool_pendingexp.sql");
     if (!query) {
         psError(PXTOOLS_ERR_SYS, false, "failed to retreive SQL statement");
@@ -305 +305 @@
     }
     psFree(where);
+
+    psStringAppend(&query, "\nORDER BY priority DESC, cam_id");
 
     // treat limit == 0 as "no limit"
@@ -531 +533 @@
     PXOPT_COPY_S64(config->args, where, "-cam_id",   "camRun.cam_id",   "==");
 
-    psString query = pxDataGet("camtool_find_pendingexp.sql");
+    psString query = pxDataGet("camtool_addprocessedexp.sql");
     if (!query) {
         psError(PXTOOLS_ERR_SYS, false, "failed to retreive SQL statement");