Index: trunk/ippTools/src/camtool.c
===================================================================
--- trunk/ippTools/src/camtool.c	(revision 23873)
+++ trunk/ippTools/src/camtool.c	(revision 23920)
@@ -109,5 +109,5 @@
     psMetadata *where = psMetadataAlloc();
     pxcamGetSearchArgs (config, where);
-    PXOPT_COPY_STR(config->args, where, "-label",     "camRun.label",     "==");
+    pxAddLabelSearchArgs (config, where, "-label", "camRun.label", "==");
     PXOPT_COPY_STR(config->args, where, "-reduction", "camRun.reduction", "==");
 
@@ -296,5 +296,5 @@
     pxcamGetSearchArgs (config, where);
     PXOPT_COPY_S64(config->args, where, "-cam_id",    "camRun.cam_id", "==");
-    PXOPT_COPY_STR(config->args, where, "-label",     "camRun.label", "==");
+    pxAddLabelSearchArgs (config, where, "-label", "camRun.label", "==");
     PXOPT_COPY_STR(config->args, where, "-reduction", "camRun.reduction", "==");
 
@@ -360,5 +360,5 @@
     pxcamGetSearchArgs (config, where);
     PXOPT_COPY_S64(config->args, where, "-cam_id",    "camRun.cam_id",                "==");
-    PXOPT_COPY_STR(config->args, where, "-label",     "camRun.label",                 "==");
+    pxAddLabelSearchArgs (config, where, "-label",    "camRun.label",                 "==");
     PXOPT_COPY_STR(config->args, where, "-reduction", "camRun.reduction",             "==");
     PXOPT_COPY_S64(config->args, where, "-chip_id",   "camRun.chip_id",              "==");
@@ -677,5 +677,5 @@
     pxcamGetSearchArgs (config, where);
     PXOPT_COPY_S64(config->args, where, "-cam_id",    "camRun.cam_id",    "==");
-    PXOPT_COPY_STR(config->args, where, "-label",     "camRun.label",     "==");
+    pxAddLabelSearchArgs (config, where, "-label",    "camRun.label",     "==");
     PXOPT_COPY_STR(config->args, where, "-reduction", "camRun.reduction", "==");
 
@@ -953,5 +953,5 @@
 
     psMetadata *where = psMetadataAlloc();
-    PXOPT_COPY_STR(config->args, where, "-label", "label", "==");
+    pxAddLabelSearchArgs (config, where, "-label", "label", "==");
 
     psString query = pxDataGet("camtool_pendingcleanuprun.sql");
@@ -1018,5 +1018,5 @@
         PXOPT_COPY_S64(config->args, where, "-cam_id", "cam_id", "==");
     }
-    PXOPT_COPY_STR(config->args, where, "-label", "label", "==");
+    pxAddLabelSearchArgs (config, where, "-label", "label", "==");
 
     psString query = pxDataGet("camtool_pendingcleanupexp.sql");