Changeset 23500

Timestamp:

Mar 24, 2009, 12:17:19 PM (17 years ago)

Author:

bills

Message:

correctly add -exp_id_begin and -exp_id_end to the revert functions

Location:

trunk/ippTools/src

Files:

• regtool.c (modified) (6 diffs)
• regtoolConfig.c (modified) (2 diffs)

trunk/ippTools/src/regtool.c

@@ -407 +407 @@
     PXOPT_COPY_STR(config->args, where,  "-class_id",     "class_id", "==");
     PXOPT_COPY_S16(config->args, where,  "-code",         "fault", "==");
+    PXOPT_COPY_S64(config->args, where,  "-exp_id_begin", "exp_id", ">=");
+    PXOPT_COPY_S64(config->args, where,  "-exp_id_end", "exp_id", "<=");
 
     psString query = pxDataGet("regtool_revertprocessedimfile.sql");
@@ -419 +421 @@
         psStringAppend(&query, " AND %s", whereClause);
         psFree(whereClause);
+    } else {
+        psFree(where);
+        psError(PXTOOLS_ERR_DATA, false, "search parameters are required");
+        return false;
     }
     psFree(where);
@@ -429 +435 @@
     psFree(query);
 
-    if (psDBAffectedRows(config->dbh) < 1) {
-        psError(PS_ERR_UNKNOWN, false, "should have affected atleast 1 row");
-        return false;
-    }
+    int numUpdated = psDBAffectedRows(config->dbh);
+
+    psLogMsg("regtool", PS_LOG_INFO, "Updated %d rawImfile", numUpdated);
 
     return true;
@@ -958 +963 @@
     PXOPT_COPY_S64(config->args, where,  "-exp_id",       "exp_id", "==");
     PXOPT_COPY_S16(config->args, where,  "-code",         "fault", "==");
-    PXOPT_COPY_S64(config->args, where,  "-exp_id_begin", "minimum exp_id", ">=");
-    PXOPT_COPY_S64(config->args, where,  "-exp_id_end", "maximum exp_id", "<=");
+    PXOPT_COPY_S64(config->args, where,  "-exp_id_begin", "exp_id", ">=");
+    PXOPT_COPY_S64(config->args, where,  "-exp_id_end", "exp_id", "<=");
 
     psString query = pxDataGet("regtool_revertprocessedexp.sql");
@@ -971 +976 @@
         psString whereClause = psDBGenerateWhereConditionSQL(where, "rawExp");
         psStringAppend(&query, " AND %s", whereClause);
+        psFree(whereClause);
+    } else {
         psFree(where);
-        psFree(whereClause);
+        psError(PXTOOLS_ERR_DATA, false, "search parameters are required");
+        return false;
     }
     psFree(where);
@@ -983 +991 @@
     psFree(query);
 
-    if (psDBAffectedRows(config->dbh) < 1) {
-        psError(PS_ERR_UNKNOWN, false, "should have affected atleast 1 row");
-        return false;
-    }
+    int numUpdated = psDBAffectedRows(config->dbh);
+
+    psLogMsg("regtool", PS_LOG_INFO, "Updated %d rawExp", numUpdated);
 
     return true;

trunk/ippTools/src/regtoolConfig.c

@@ -135 +135 @@
     // -revertprocessedimfile
     psMetadata *revertprocessedimfileArgs = psMetadataAlloc();
-    ADD_OPT(S64, revertprocessedimfileArgs, "-exp_id",        "search by exposure ID (required)", 0);
+    ADD_OPT(S64, revertprocessedimfileArgs, "-exp_id",        "search by exposure ID", 0);
     ADD_OPT(Str, revertprocessedimfileArgs, "-tmp_class_id",  "searcy by temp. class ID", NULL);
     ADD_OPT(Str, revertprocessedimfileArgs, "-class_id",      "search by class ID", NULL);
@@ -272 +272 @@
     // -revertprocessedexp
     psMetadata *revertprocessedexpArgs = psMetadataAlloc();
-    psMetadataAddS64(revertprocessedexpArgs, PS_LIST_TAIL, "-exp_id",   0,            "search by exposure ID (required)", 0);
+    psMetadataAddS64(revertprocessedexpArgs, PS_LIST_TAIL, "-exp_id",   0,            "search by exposure ID", 0);
     psMetadataAddS16(revertprocessedexpArgs, PS_LIST_TAIL, "-code",     0,            "search by fault code", 0);
+    psMetadataAddS64(revertprocessedexpArgs, PS_LIST_TAIL, "-exp_id_begin",   0,      "search by exposure ID", 0);
+    psMetadataAddS64(revertprocessedexpArgs, PS_LIST_TAIL, "-exp_id_end",   0,      "search by exposure ID", 0);
 
     // -updatedprocessedexp