Changeset 18923 for branches/eam_branch_20080719/ippTools/src/difftool.c

Timestamp:

Aug 5, 2008, 2:07:07 PM (18 years ago)

Author:

eugene

Message:

updates from HEAD

File:

• branches/eam_branch_20080719/ippTools/src/difftool.c (modified) (10 diffs)

branches/eam_branch_20080719/ippTools/src/difftool.c

@@ -652 +652 @@
 
 // Generate a single populated run
-static bool populatedrun(const char *workdir, // Working directory
+static bool populatedrun(psArray *list, // List of runs, to print
+                         const char *workdir, // Working directory
                          const char *skycell_id, // Skycell identifier
                          const char *tess_id, // Tessellation identifier
@@ -759 +760 @@
     }
 
-    if (!diffRunPrintObject(stdout, run, !simple)) {
-            psError(PS_ERR_UNKNOWN, false, "failed to print object");
-            psFree(run);
-            return false;
+    if (list) {
+        psArrayAdd(list, list->n, run);
     }
 
@@ -782 +781 @@
     PXOPT_LOOKUP_S64(input_warp_id, config->args, "-input_warp_id", false, false);
     PXOPT_LOOKUP_S64(input_stack_id, config->args, "-input_stack_id", false, false);
+    PXOPT_LOOKUP_BOOL(simple, config->args, "-simple", false);
 
     if (template_stack_id && template_warp_id) {
@@ -803 +803 @@
     }
 
-    return populatedrun(workdir, skycell_id, tess_id,
-                        input_warp_id ? input_warp_id : PS_MAX_S64,
-                        input_stack_id ? input_stack_id : PS_MAX_S64,
-                        template_warp_id ? template_warp_id : PS_MAX_S64,
-                        template_stack_id ? template_stack_id : PS_MAX_S64,
-                        config);
+    psArray *list = psArrayAllocEmpty(16); // List of runs, to print
+
+    if (!populatedrun(list, workdir, skycell_id, tess_id,
+                      input_warp_id ? input_warp_id : PS_MAX_S64,
+                      input_stack_id ? input_stack_id : PS_MAX_S64,
+                      template_warp_id ? template_warp_id : PS_MAX_S64,
+                      template_stack_id ? template_stack_id : PS_MAX_S64,
+                      config)) {
+        psError(PS_ERR_UNKNOWN, false, "failed to create populated diffRun");
+        psFree(list);
+        return false;
+    }
+
+    if (!diffRunPrintObjects(stdout, list, !simple)) {
+            psError(PS_ERR_UNKNOWN, false, "failed to print object");
+            psFree(list);
+            return false;
+    }
+    psFree(list);
 
     return true;
@@ -820 +833 @@
     psMetadata *where = psMetadataAlloc();
 
-    PXOPT_COPY_S64(config->args, where,  "-diff_id", "diff_id", "==");
     PXOPT_COPY_S64(config->args, where, "-warp_id", "warp_id", "==");
     PXOPT_COPY_STR(config->args, where, "-skycell_id", "skycell_id", "==");
-    PXOPT_COPY_STR(config->args, where,  "-tess_id", "tess_id", "==");
+    PXOPT_COPY_STR(config->args, where, "-tess_id", "tess_id", "==");
+    PXOPT_COPY_STR(config->args, where, "-filter", "filter", "==");
     PXOPT_COPY_STR(config->args, where,  "-kind", "kind", "==");
+    PXOPT_COPY_F32(config->args, where,  "-good_frac", "good_frac", ">=");
     PXOPT_LOOKUP_STR(workdir, config->args, "-workdir", true, false); // required options
     PXOPT_LOOKUP_TIME(registered, config->args, "-registered", false, false);
-    PXOPT_LOOKUP_BOOL(template, config->args, "-template", false);
     PXOPT_LOOKUP_BOOL(simple, config->args, "-simple", false);
+    PXOPT_LOOKUP_BOOL(newTemplates, config->args, "-new-templates", false);
 
     // find all things to queue
-    psString query = pxDataGet("difftool_queue.sql");
+    psString query = pxDataGet("difftool_definebyquery.sql");
     if (!query) {
         psError(PXTOOLS_ERR_DATA, false, "failed to retreive SQL statement");
@@ -837 +851 @@
     }
 
-    if (template) {
-        // list only faulted rows
-        psStringAppend(&query, " %s", " AND diffInputSkyfile.template != 0");
+    if (newTemplates) {
+        // Warps that haven't been diffed OR warps that can take a newer template in the diff
+        psStringAppend(&query, " WHERE (diff_id IS NULL OR best_stack_id > current_stack_id)");
     } else {
-        // don't list faulted rows
-        psStringAppend(&query, " %s",
-                       " AND (diffInputSkyfile.template = 0 OR diffInputSkyfile.template IS NULL)");
+        // Only warps that haven't been diffed
+        psStringAppend(&query, " WHERE diff_id IS NULL");
     }
 
     if (psListLength(where->list)) {
-        psString whereClause = psDBGenerateWhereConditionSQL(where, NULL);
+        psString whereClause = psDBGenerateWhereConditionSQL(where, "warpsToDiff");
         psStringAppend(&query, " AND %s", whereClause);
         psFree(whereClause);
@@ -880 +893 @@
     }
 
+    psArray *list = psArrayAllocEmpty(16); // List of runs, to print
     long numGood = 0;                   // Number of good rows added
     for (long i = 0; i < output->n; i++) {
@@ -896 +910 @@
             continue;
         }
-        psS64 stack_id = psMetadataLookupS64(&mdok, row, "stack_id");
+        psS64 stack_id = psMetadataLookupS64(&mdok, row, "best_stack_id");
         if (!mdok) {
             psWarning("stack_id not found --- ignoring row %ld", i);
@@ -907 +921 @@
         }
 
-        if (!populatedrun(workdir, skycell_id, tess_id, warp_id, PS_MAX_S64, PS_MAX_S64, stack_id, config)) {
+        if (!populatedrun(list, workdir, skycell_id, tess_id, warp_id, PS_MAX_S64, PS_MAX_S64,
+                          stack_id, config)) {
             psWarning("Unable to add run for %s,%s,%" PRId64 ",%" PRId64, skycell_id, tess_id,
                       warp_id, stack_id);
@@ -916 +931 @@
         numGood++;
     }
-
-    psLogMsg("difftool", PS_LOG_INFO, "%ld runs added.", numGood);
-
     psFree(output);
+
+    if (!diffRunPrintObjects(stdout, list, !simple)) {
+        psError(PS_ERR_UNKNOWN, false, "failed to print object");
+        psFree(list);
+        return false;
+    }
+    psFree(list);
 
     return true;