Changeset 41582 for trunk

Timestamp:

May 15, 2021, 8:38:08 AM (5 years ago)

Author:

eugene

Message:

new functions added: updatesummitExpMode, summitExpSetFault; add faults 200 & 203

Location:

trunk/ippTools/src

Files:

• pztool.c (modified) (4 diffs)
• pztoolConfig.c (modified) (1 diff)

trunk/ippTools/src/pztool.c

@@ -49 +49 @@
 static bool updatepzexpMode(pxConfig *config);
 static bool updatenewexpMode(pxConfig *config);
+static bool updatesummitExpMode(pxConfig *config);
 
 // static bool copydoneCompleteExp(pxConfig *config);
@@ -54 +55 @@
 static psArray *pzArrayZip(psArray *arraySet, psS64 limit);
 static bool pzDownloadExpSetState(pxConfig *config, const psS64 summit_id, const char *state);
+static bool summitExpSetFault(pxConfig *config, const psS64 summit_id, const int fault);
 
 # define MODECASE(caseName, func) \
@@ -88 +90 @@
         MODECASE(PZTOOL_MODE_UPDATEPZEXP, updatepzexpMode);
         MODECASE(PZTOOL_MODE_UPDATENEWEXP, updatenewexpMode);
+        MODECASE(PZTOOL_MODE_UPDATESUMMITEXP, updatesummitExpMode);
         default:
             psAbort("invalid option (this should not happen)");
@@ -933 +936 @@
 }
 
+static bool summitExpSetFault(pxConfig *config, const psS64 summit_id, const int fault)
+{
+    // check that state is a valid string value
+  if ((fault < 0) || (fault > 2048)) {
+    psError(PS_ERR_UNKNOWN, false,
+            "invalid summitExp fault: %d", fault);
+    return false;
+  }
+
+    char *query = "UPDATE summitExp SET fault = %d WHERE summit_id = %ld";
+    if (!p_psDBRunQueryF(config->dbh, query, fault, summit_id)) {
+        psError(PS_ERR_UNKNOWN, false, "failed to change state for %lld", (long long) summit_id);
+        return false;
+    }
+
+    return true;
+}
+
+static bool updatesummitExpMode(pxConfig *config)
+{
+  PS_ASSERT_PTR_NON_NULL(config, false);
+  PXOPT_LOOKUP_S64(summit_id, config->args, "-summit_id", true, false);
+  PXOPT_LOOKUP_S32(state,    config->args, "-set_fault",true, false);
+
+  if (!summitExpSetFault(config,summit_id, fault)) {
+    psError(PS_ERR_UNKNOWN, false, "failed to change state for %lld", (long long) summit_id);
+    return false;
+  }
+  return true;
+}
+  
+  
 static bool updatepzexpMode(pxConfig *config)
 {

trunk/ippTools/src/pztoolConfig.c

@@ -171 +171 @@
     psMetadataAddStr(updatepzexpArgs, PS_LIST_TAIL, "-set_state",  0,            "define new state (required)", NULL);
     
+    // -updatesummitexp
+    psMetadata *updatesummitexpArgs = psMetadataAlloc();
+    psMetadataAddS64(updatesummitexpArgs, PS_LIST_TAIL, "-summit_id", 0,     "define summit_id", 0);
+    psMetadataAddStr(updatesummitexpArgs, PS_LIST_TAIL, "-exp_name",   0,            "search by exposure name (required)", NULL);
+    psMetadataAddStr(updatesummitexpArgs, PS_LIST_TAIL, "-inst",       0,            "search by camera (required)", NULL);
+    psMetadataAddStr(updatesummitexpArgs, PS_LIST_TAIL, "-telescope",  0,            "search by telescope (required)", NULL);
+    psMetadataAddS32(updatesummitexpArgs, PS_LIST_TAIL, "-set_fault",  0,            "define new fault (required)", 0);
+    
     // -updatenewexp
     psMetadata *updatenewexpArgs = psMetadataAlloc();