Changeset 30586 for branches/czw_branch/20101203/ippTools/src/pztool.c

Timestamp:

Feb 11, 2011, 4:29:48 PM (15 years ago)

Author:

watersc1

Message:

Trying to merge back into trunk.

Location:

branches/czw_branch/20101203

Files:

• . (modified) (1 prop)
• ippTools/src/pztool.c (modified) (6 diffs)

branches/czw_branch/20101203/ippTools/src/pztool.c

@@ -47 +47 @@
 static bool advanceMode(pxConfig *config);
 
+static bool updatepzexpMode(pxConfig *config);
+static bool updatenewexpMode(pxConfig *config);
+
 // static bool copydoneCompleteExp(pxConfig *config);
 static psArray *pzGetPendingCameras(pxConfig *config);
@@ -83 +86 @@
         MODECASE(PZTOOL_MODE_TOADVANCE, toadvanceMode);
         MODECASE(PZTOOL_MODE_ADVANCE, advanceMode);
+        MODECASE(PZTOOL_MODE_UPDATEPZEXP, updatepzexpMode);
+        MODECASE(PZTOOL_MODE_UPDATENEWEXP, updatenewexpMode);
         default:
             psAbort("invalid option (this should not happen)");
@@ -294 +299 @@
 
     psMetadata *where = psMetadataAlloc();
-    PXOPT_COPY_STR(config->args, where,  "-exp_name",     "exp_name", "==");
-    PXOPT_COPY_STR(config->args, where,  "-inst",         "camera", "==");
-    PXOPT_COPY_STR(config->args, where,  "-telescope",    "telescope", "==");
-    PXOPT_COPY_STR(config->args, where,  "-exp_type",     "exp_type", "==");
+    PXOPT_COPY_STR(config->args, where,  "-exp_name",      "exp_name",  "==");
+    PXOPT_COPY_STR(config->args, where,  "-inst",          "camera",    "==");
+    PXOPT_COPY_STR(config->args, where,  "-telescope",     "telescope", "==");
+    PXOPT_COPY_STR(config->args, where,  "-exp_type",      "exp_type",  "==");
+    PXOPT_COPY_TIME(config->args, where, "-dateobs_begin", "dateobs",   ">=");
+    PXOPT_COPY_TIME(config->args, where, "-dateobs_end",   "dateobs",   "<=");
 
     PXOPT_LOOKUP_BOOL(desc, config->args, "-desc", false);
@@ -325 +332 @@
 
         if (psListLength(where->list)) {
-            psString whereClause = psDBGenerateWhereConditionSQL(where, "pzDownloadImfile");
+            psString whereClause = psDBGenerateWhereConditionSQL(where, NULL);
             psStringAppend(&query, " AND %s", whereClause);
             psFree(whereClause);
@@ -889 +896 @@
             || (strncmp(state, "stop", 5) == 0)
             || (strncmp(state, "reg", 4) == 0)
+            || (strncmp(state, "drop", 5) == 0)
         )
     ) {
@@ -905 +913 @@
 }
 
+static bool updatepzexpMode(pxConfig *config)
+{
+  PS_ASSERT_PTR_NON_NULL(config, false);
+  PXOPT_LOOKUP_STR(exp_name, config->args, "-exp_name", true, false);
+  PXOPT_LOOKUP_STR(camera,   config->args, "-inst",   true, false);
+  PXOPT_LOOKUP_STR(telescope,config->args, "-telescope",true, false);
+  PXOPT_LOOKUP_STR(state,    config->args, "-set_state",true, false);
+
+  if (!pzDownloadExpSetState(config,exp_name,camera,telescope,state)) {
+    psError(PS_ERR_UNKNOWN, false, "failed to change state for %s:%s:%s", exp_name, camera, telescope);
+    return false;
+  }
+  return true;
+}
+  
+  
+static bool updatenewexpMode(pxConfig *config)
+{
+    PS_ASSERT_PTR_NON_NULL(config, false);
+
+    psMetadata *where = psMetadataAlloc();
+    PXOPT_COPY_S64(config->args, where, "-exp_id", "exp_id", "==");
+    PXOPT_COPY_STR(config->args, where,  "-exp_name", "tmp_exp_name", "==");
+
+    PXOPT_LOOKUP_STR(new_state, config->args, "-set_state", true, false);
+
+    if (strcmp(new_state, "drop") && strcmp(new_state, "run") && strcmp(new_state, "wait")) {
+        psError(PXTOOLS_ERR_ARGUMENTS, true, "%s is not a valid value for -set_state", new_state);
+        psFree(where);
+        return false;
+    }
+
+    if (psListLength(where->list) < 1) {
+        psFree(where);
+        psError(PXTOOLS_ERR_CONFIG, false, "-exp_name or -exp_id is required");
+        return false;
+    }
+
+    psString query = NULL;
+    psStringAppend(&query, "UPDATE newExp SET state = '%s'", new_state);
+
+    psString whereClause = psDBGenerateWhereConditionSQL(where, NULL);
+    psStringAppend(&query, "\nWHERE %s", whereClause);
+
+    psFree(whereClause);
+    psFree(where);
+
+    if (!p_psDBRunQuery(config->dbh, query)) {
+        psError(PS_ERR_UNKNOWN, false, "database error");
+        psFree(query);
+        return false;
+    }
+    psFree(query);
+
+    return true;
+}
+
+
+
 
 #if 0