Changeset 28353

Timestamp:

Jun 16, 2010, 12:53:53 PM (16 years ago)

Author:

bills

Message:

Merge changes from trunk to order camtool -pendingexp by Label.priority

Location:

tags/ipp-20100610/ippTools

Files:

• share/Makefile.am (modified) (1 diff)
• share/camtool_addprocessedexp.sql (copied) (copied from trunk/ippTools/share/camtool_addprocessedexp.sql ) (1 prop)
• share/camtool_find_pendingexp.sql (deleted)
• share/camtool_pendingexp.sql (copied) (copied from trunk/ippTools/share/camtool_pendingexp.sql ) (1 prop)
• src/camtool.c (modified) (3 diffs, 1 prop)

tags/ipp-20100610/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 \

tags/ipp-20100610/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");