Changeset 30912 for trunk/ippTools/src/addtool.c

Timestamp:

Mar 15, 2011, 4:50:08 PM (15 years ago)

Author:

heather

Message:

addtool minidvodb verification added

File:

• trunk/ippTools/src/addtool.c (modified) (6 diffs)

trunk/ippTools/src/addtool.c

@@ -1179 +1179 @@
   PXOPT_LOOKUP_F32(dtime_resort, config->args, "-dtime_resort", false, false);
   PXOPT_LOOKUP_F32(dtime_merge, config->args, "-dtime_merge", false, false);
+  PXOPT_LOOKUP_F32(dtime_verify, config->args, "-dtime_verify", false, false);
+  PXOPT_LOOKUP_F32(dtime_script, config->args, "-dtime_script", false, false);
+  
   PXOPT_LOOKUP_TIME(epoch, config->args, "-epoch", false, false);
   PXOPT_LOOKUP_S16(fault,         config->args, "-fault", false, false);
@@ -1230 +1233 @@
                dtime_resort,
                dtime_relphot,
+               dtime_verify,
                dtime_merge,
+               dtime_script,
                epoch,
                mergedvodb_path,
@@ -1293 +1298 @@
   psStringAppend(&query4, "update minidvodbProcessed set merge_order = %"PRIu64,m_order);
   psStringAppend(&query4," where minidvodb_id = %" PRIu64,  minidvodb_id);
-  printf("%s", query4);
+  //printf("%s", query4);
   if (!p_psDBRunQuery(config->dbh, query4)) {
     // rollback
@@ -1511 +1516 @@
   PXOPT_LOOKUP_F32(dtime_resort,  config->args, "-set_dtime_resort", false, false);
   PXOPT_LOOKUP_F32(dtime_merge,  config->args, "-set_dtime_merge", false, false);
-
+PXOPT_LOOKUP_F32(dtime_verify,  config->args, "-set_dtime_verify", false, false);
+PXOPT_LOOKUP_F32(dtime_script,  config->args, "-set_dtime_script", false, false);
   PXOPT_COPY_S64(config->args, where, "-minidvodb_id",     "minidvodbProcessed.minidvodb_id", "==");
   PXOPT_COPY_STR(config->args, where, "-minidvodb_name",     "minidvodbRun.minidvodb_name", "==");
@@ -1562 +1568 @@
     cnt++;
  }
+if (dtime_verify) {
+    if (cnt) {
+      psStringAppend(&query, "%s", comma);
+    }
+    psStringAppend(&query, " dtime_verify = %f", dtime_verify);
+    cnt++;
+ }
+if (dtime_script) {
+    if (cnt) {
+      psStringAppend(&query, "%s", comma);
+    }
+    psStringAppend(&query, " dtime_script = %f", dtime_script);
+    cnt++;
+ }
 
   psString whereClause = psDBGenerateWhereConditionSQL(where, NULL);
@@ -1567 +1587 @@
 
   if (!p_psDBRunQuery(config->dbh, query)) {
-   psError(PS_ERR_UNKNOWN, false, "database error");
+    psError(PS_ERR_UNKNOWN, false, "database error \n%s\n",query );
    psFree(query);
    return false;