Index: trunk/ippTools/src/camtool.c
===================================================================
--- trunk/ippTools/src/camtool.c	(revision 19301)
+++ trunk/ippTools/src/camtool.c	(revision 19423)
@@ -105,4 +105,5 @@
     psMetadata *where = psMetadataAlloc();
     pxcamGetSearchArgs (config, where);
+    PXOPT_COPY_STR(config->args, where, "-label", "chipRun.label", "==");
 
     if (!psListLength(where->list)
@@ -220,4 +221,5 @@
     PXOPT_COPY_S64(config->args, where, "-cam_id", "cam_id", "==");
     pxcamGetSearchArgs (config, where);
+    PXOPT_COPY_STR(config->args, where, "-label", "camRun.label", "==");
 
     if (!psListLength(where->list)
@@ -266,4 +268,5 @@
     PXOPT_COPY_S64(config->args, where, "-cam_id", "cam_id", "==");
     pxcamGetSearchArgs (config, where);
+    PXOPT_COPY_STR(config->args, where, "-label", "label", "==");
 
     PXOPT_LOOKUP_U64(limit, config->args, "-limit", false, false);
@@ -331,4 +334,5 @@
     PXOPT_COPY_STR(config->args, where, "-class_id", "class_id", "==");
     pxcamGetSearchArgs (config, where);
+    PXOPT_COPY_STR(config->args, where, "-label", "camRun.label", "==");
 
     PXOPT_LOOKUP_BOOL(simple, config->args, "-simple", false);
@@ -427,6 +431,6 @@
     if (psListLength(where->list)) {
         psString whereClaus = psDBGenerateWhereSQL(where, NULL);
-	psStringAppend(&query, "%s", whereClaus);
-	psFree(whereClaus);
+        psStringAppend(&query, "%s", whereClaus);
+        psFree(whereClaus);
     }
     psFree(where);
@@ -564,4 +568,5 @@
     PXOPT_COPY_S64(config->args, where, "-cam_id",   "cam_id",   "==");
     pxcamGetSearchArgs (config, where);
+    PXOPT_COPY_STR(config->args, where, "-label", "camRun.label", "==");
 
     psString query = pxDataGet("camtool_find_processedexp.sql");
@@ -632,4 +637,5 @@
     PXOPT_COPY_S64(config->args, where, "-cam_id", "cam_id", "==");
     pxcamGetSearchArgs (config, where);
+    PXOPT_COPY_STR(config->args, where, "-label", "camRun.label", "==");
 
     if (!psListLength(where->list) && !psMetadataLookupBool(NULL, config->args, "-all")) {
@@ -646,61 +652,61 @@
 
     {
-	psString query = pxDataGet("camtool_reset_faulted_runs.sql");
-	if (!query) {
-	    psError(PXTOOLS_ERR_DATA, false, "failed to retreive SQL statement");
-	    psFree(where);
-	    return false;
-	}
-
-	// use psDBGenerateWhereConditionalSQL with AND ... because the SQL ends in a WHERE
-	if (where && psListLength(where->list)) {
-	    psString whereClause = psDBGenerateWhereConditionSQL(where, NULL);
-	    psStringAppend(&query, " AND %s", whereClause);
-	    psFree(whereClause);
-	}
-
-	if (!p_psDBRunQuery(config->dbh, query)) {
-	    // rollback
-	    if (!psDBRollback(config->dbh)) {
-		psError(PS_ERR_UNKNOWN, false, "database error");
-	    }
-	    psError(PS_ERR_UNKNOWN, false, "database error");
-	    psFree(query);
-	    psFree(where);
-	    return false;
-	}
-	psFree(query);
+        psString query = pxDataGet("camtool_reset_faulted_runs.sql");
+        if (!query) {
+            psError(PXTOOLS_ERR_DATA, false, "failed to retreive SQL statement");
+            psFree(where);
+            return false;
+        }
+
+        // use psDBGenerateWhereConditionalSQL with AND ... because the SQL ends in a WHERE
+        if (where && psListLength(where->list)) {
+            psString whereClause = psDBGenerateWhereConditionSQL(where, NULL);
+            psStringAppend(&query, " AND %s", whereClause);
+            psFree(whereClause);
+        }
+
+        if (!p_psDBRunQuery(config->dbh, query)) {
+            // rollback
+            if (!psDBRollback(config->dbh)) {
+                psError(PS_ERR_UNKNOWN, false, "database error");
+            }
+            psError(PS_ERR_UNKNOWN, false, "database error");
+            psFree(query);
+            psFree(where);
+            return false;
+        }
+        psFree(query);
     }
 
     {
-	psString query = pxDataGet("camtool_revertprocessedexp.sql");
-	if (!query) {
-	    // rollback
-	    if (!psDBRollback(config->dbh)) {
-		psError(PS_ERR_UNKNOWN, false, "database error");
-	    }
-	    psError(PXTOOLS_ERR_DATA, false, "failed to retreive SQL statement");
-	    psFree(where);
-	    return false;
-	}
-
-	// use psDBGenerateWhereConditionalSQL with AND ... because the SQL ends in a WHERE
-	if (where && psListLength(where->list)) {
-	    psString whereClause = psDBGenerateWhereConditionSQL(where, NULL);
-	    psStringAppend(&query, " AND %s", whereClause);
-	    psFree(whereClause);
-	}
-
-	if (!p_psDBRunQuery(config->dbh, query)) {
-	    // rollback
-	    if (!psDBRollback(config->dbh)) {
-		psError(PS_ERR_UNKNOWN, false, "database error");
-	    }
-	    psError(PS_ERR_UNKNOWN, false, "database error");
-	    psFree(query);
-	    psFree(where);
-	    return false;
-	}
-	psFree(query);
+        psString query = pxDataGet("camtool_revertprocessedexp.sql");
+        if (!query) {
+            // rollback
+            if (!psDBRollback(config->dbh)) {
+                psError(PS_ERR_UNKNOWN, false, "database error");
+            }
+            psError(PXTOOLS_ERR_DATA, false, "failed to retreive SQL statement");
+            psFree(where);
+            return false;
+        }
+
+        // use psDBGenerateWhereConditionalSQL with AND ... because the SQL ends in a WHERE
+        if (where && psListLength(where->list)) {
+            psString whereClause = psDBGenerateWhereConditionSQL(where, NULL);
+            psStringAppend(&query, " AND %s", whereClause);
+            psFree(whereClause);
+        }
+
+        if (!p_psDBRunQuery(config->dbh, query)) {
+            // rollback
+            if (!psDBRollback(config->dbh)) {
+                psError(PS_ERR_UNKNOWN, false, "database error");
+            }
+            psError(PS_ERR_UNKNOWN, false, "database error");
+            psFree(query);
+            psFree(where);
+            return false;
+        }
+        psFree(query);
     }
     psFree(where);
@@ -729,5 +735,5 @@
     if (!pxSetFaultCode(config->dbh, "camProcessedExp", where, code)) {
         psError(PS_ERR_UNKNOWN, false, "failed to set set fault flag");
-	psFree (where);
+        psFree (where);
         return false;
     }