Changeset 19677

Timestamp:

Sep 23, 2008, 9:56:39 AM (18 years ago)

Author:

bills

Message:

added -updateskyfile mode removed data_state

Location:

trunk/ippTools/src

Files:

• difftool.c (modified) (4 diffs)
• difftool.h (modified) (1 diff)
• difftoolConfig.c (modified) (2 diffs)

trunk/ippTools/src/difftool.c

@@ -44 +44 @@
 static bool pendingcleanupskyfileMode(pxConfig *config);
 static bool donecleanupMode(pxConfig *config);
+static bool updatediffskyfileMode(pxConfig *config);
 
 static bool setdiffRunState(pxConfig *config, psS64 diff_id, const char *state);
@@ -78 +79 @@
         MODECASE(DIFFTOOL_MODE_PENDINGCLEANUPSKYFILE, pendingcleanupskyfileMode);
         MODECASE(DIFFTOOL_MODE_DONECLEANUP,           donecleanupMode);
+        MODECASE(DIFFTOOL_MODE_UPDATEDIFFSKYFILE,     updatediffskyfileMode);
         default:
             psAbort("invalid option (this should not happen)");
@@ -495 +497 @@
                            uri,
                            path_base,
-                           "full",      // data_state
                            bg,
                            bg_stdev,
@@ -1218 +1219 @@
     return true;
 }
+
+static bool updatediffskyfileMode(pxConfig *config)
+{
+    PS_ASSERT_PTR_NON_NULL(config, false);
+
+    PXOPT_LOOKUP_S16(code, config->args, "-code", true, false);
+
+    psMetadata *where = psMetadataAlloc();
+    PXOPT_COPY_S64(config->args, where, "-diff_id",   "diff_id",   "==");
+
+    if (!pxSetFaultCode(config->dbh, "diffSkyfile", where, code)) {
+        psError(PS_ERR_UNKNOWN, false, "failed to set set fault flag");
+        psFree (where);
+        return false;
+    }
+    psFree (where);
+
+    return true;
+}
+

trunk/ippTools/src/difftool.h

@@ -38 +38 @@
     DIFFTOOL_MODE_PENDINGCLEANUPSKYFILE,
     DIFFTOOL_MODE_DONECLEANUP,
+    DIFFTOOL_MODE_UPDATEDIFFSKYFILE,
 } difftoolMode;
 

trunk/ippTools/src/difftoolConfig.c

@@ -170 +170 @@
     psMetadata *donecleanupArgs = psMetadataAlloc();
     psMetadataAddStr(donecleanupArgs, PS_LIST_TAIL, "-label",  0,            "list blocks for specified label", NULL);
-    psMetadataAddBool(donecleanupArgs, PS_LIST_TAIL, "-simple",  0,            "use the simple output format", false);
+    psMetadataAddBool(donecleanupArgs, PS_LIST_TAIL, "-simple",  0,          "use the simple output format", false);
     psMetadataAddU64(donecleanupArgs, PS_LIST_TAIL, "-limit",  0,            "limit result set to N items", 0);
+    // -updatediffskyfile
+    psMetadata *updatediffskyfileArgs = psMetadataAlloc();
+    psMetadataAddS64(updatediffskyfileArgs, PS_LIST_TAIL, "-diff_id", 0,      "define diff ID (required)", 0);
+    psMetadataAddS16(updatediffskyfileArgs, PS_LIST_TAIL, "-code", 0,         "set fault code (required)", 0);
+
 
     psFree(now);
@@ -191 +196 @@
     PXOPT_ADD_MODE("-pendingcleanupskyfile", "show runs that need to be cleaned up", DIFFTOOL_MODE_PENDINGCLEANUPSKYFILE, pendingcleanupskyfileArgs);
     PXOPT_ADD_MODE("-donecleanup",           "show runs that have been cleaned",     DIFFTOOL_MODE_DONECLEANUP,          donecleanupArgs);
+    PXOPT_ADD_MODE("-updatediffskyfile",     "update fault code for a diffskyfile",  DIFFTOOL_MODE_UPDATEDIFFSKYFILE,          updatediffskyfileArgs);
 
     if (!pxGetOptions(stderr, argc, argv, config, modes, argSets)) {