Changeset 42412 for trunk/ippTools/src

Timestamp:

Mar 14, 2023, 3:31:02 PM (3 years ago)

Author:

eugene

Message:

add option to ignore summitcopy errors

Location:

trunk/ippTools/src

Files:

• pzgetexp.c (modified) (6 diffs)
• pzgetexpConfig.c (modified) (1 diff)

trunk/ippTools/src/pzgetexp.c

@@ -77 +77 @@
     PXOPT_LOOKUP_S32(timeout, config->args, "-timeout", false, false);
     PXOPT_LOOKUP_BOOL(all, config->args, "-all", false);
+    PXOPT_LOOKUP_BOOL(ignore_errors, config->args, "-ignore-errors", false);
 
     // find last fileset/exp_name (if we have one)
@@ -180 +181 @@
     }
 
+    // XXX for test, make this not a temporary table:
     // create a temporry table
     {
@@ -197 +199 @@
 
     {
-        char *query = "INSERT INTO incoming (exp_name, camera, telescope, dateobs, exp_type, uri) VALUES (?, ?, ?, ?, ?, ?)";
+      char *query_notice = "INSERT INTO incoming (exp_name, camera, telescope, dateobs, exp_type, uri) VALUES (?, ?, ?, ?, ?, ?)";
+      char *query_ignore = "INSERT IGNORE INTO incoming (exp_name, camera, telescope, dateobs, exp_type, uri) VALUES (?, ?, ?, ?, ?, ?)";
+
+      char *query = ignore_errors ? query_ignore : query_notice;
 
         long inserted = p_psDBRunQueryPrepared(config->dbh, newSummitExps, query);
@@ -209 +214 @@
             return false;
         }
+        fprintf (stderr, "inserted: %d\n", (int) inserted);
         // sanity check that we actually inserted something
         if (inserted == 0) {
@@ -222 +228 @@
 
     psFree(newSummitExps);
+
+    // TEST
+    if (0) {
+        char *query = "select * from incomingTest";
+        p_psDBRunQuery(config->dbh, query);
+        psArray *output = p_psDBFetchResult(config->dbh);
+        if (!output) {
+            psError(PS_ERR_UNKNOWN, false, "database error");
+            return false;
+        }
+        
+        // negative simple so the default is true
+        if (!ippdbPrintMetadatas(stdout, output, "test", TRUE)) {
+            psError(PS_ERR_UNKNOWN, false, "failed to print array");
+            psFree(output);
+            return false;
+        }
+        psFree(output);
+        exit (2);
+    }
+
+    // debug this query
+    if (0) {
+        char *query = 
+            "DESCRIBE INSERT INTO summitExp" 
+            "   SELECT"
+            "       NULL," // summit_id
+            "       incomingTest.*,"
+            "       NULL,"  // imfiles
+            "       0,"     // fault
+            "       NULL"   // epoch
+            "   FROM incomingTest"
+            "   LEFT JOIN summitExp"
+            "       USING(exp_name, camera, telescope)"
+            "   WHERE"
+            "       summitExp.exp_name is NULL"
+            "       AND summitExp.camera is NULL"
+            "       AND summitExp.telescope is NULL";
+
+        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");
+            return false;
+        }
+        psArray *output = p_psDBFetchResult(config->dbh);
+        if (!output) {
+            psError(PS_ERR_UNKNOWN, false, "database error");
+            return false;
+        }
+        
+        // negative simple so the default is true
+        if (!ippdbPrintMetadatas(stdout, output, "test", TRUE)) {
+            psError(PS_ERR_UNKNOWN, false, "failed to print array");
+            psFree(output);
+            return false;
+        }
+        psFree(output);
+    }
+
+    // exit  (1);
 
     // add new exps to summitExp
@@ -239 +308 @@
             "       summitExp.exp_name is NULL"
             "       AND summitExp.camera is NULL"
-            "       AND summitExp.telescope is NULL";
+            "       AND summitExp.telescope is NULL";
+
+        // MAJOR hack to avoid excess long inserts
+        // include this line to limit the incomping entries
+        // "       AND incoming.dateobs > '2023-01-01'";
 
         if (!p_psDBRunQuery(config->dbh, query)) {

trunk/ippTools/src/pzgetexpConfig.c

@@ -55 +55 @@
     psMetadataAddBool(args, PS_LIST_TAIL, "-all",  0,
         "download ALL filesets", 0);
+    psMetadataAddBool(args, PS_LIST_TAIL, "-ignore-errors",  0,
+        "do not fail if one of the entries raises a database error", 0);