Changeset 18923 for branches/eam_branch_20080719/ippTools/src/stacktool.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/stacktool.c (modified) (11 diffs)

branches/eam_branch_20080719/ippTools/src/stacktool.c

@@ -107 +107 @@
     psMetadata *whereRE = psMetadataAlloc(); // rawExp where
     psMetadata *whereWSF = psMetadataAlloc(); // warpSkyfile where
-    psMetadata *having = psMetadataAlloc(); // having
+    psMetadata *having = psMetadataAlloc(); // HAVING clause
     // map -inst -> camera, etc
     PXOPT_COPY_STR(config->args, whereRE, "-select_inst", "camera", "==");
@@ -128 +128 @@
 
     PXOPT_COPY_STR(config->args, having, "-select_skycell_id", "skycell_id", "==");
+    PXOPT_COPY_S32(config->args, having, "-min_num", "num_warp", ">=");
 
     PXOPT_LOOKUP_S32(randomLimit, config->args, "-random", false, false);
 
-    PXOPT_COPY_S32(config->args, having, "-min_num", "num_warp", ">=");
-    PXOPT_COPY_S32(config->args, having, "-min_new", "(num_warp - num_stack)", ">=");
-
+    PXOPT_LOOKUP_S32(min_new, config->args, "-min_new", false, false);
     PXOPT_LOOKUP_F32(min_frac, config->args, "-min_frac", false, false);
 
@@ -178 +177 @@
     psFree(groupby);
 
-    if (psListLength(having->list)) {
-        psString havingClause = psDBGenerateWhereConditionSQL(having, NULL);
-        psStringAppend(&select, " HAVING %s", havingClause);
-        psFree(havingClause);
-    }
-
-    // Gotta handle this one explicitly --- want to avoid divisions
-    if (isfinite(min_frac)) {
+    // Restriction on aggregated quantities using HAVING
+    {
+        psString havingClause = NULL;   // HAVING string
         if (psListLength(having->list)) {
-            psStringAppend(&select, " AND");
-        } else {
-            psStringAppend(&select, " HAVING");
-        }
-        psStringAppend(&select, " num_warp >= %f * num_stack", (double)min_frac);
-    }
-
+            havingClause = psDBGenerateWhereConditionSQL(having, NULL);
+        }
+
+        if (min_new > 0) {
+            if (havingClause) {
+                psStringAppend(&havingClause, " AND");
+            }
+            psStringAppend(&havingClause,
+                           " (num_warp - num_stack >= %d OR (num_warp >= %d AND num_stack IS NULL))",
+                           min_new, min_new);
+        }
+        if (isfinite(min_frac)) {
+            if (havingClause) {
+                psStringAppend(&havingClause, " AND");
+            }
+            // Avoiding division by zero
+            psStringAppend(&havingClause, " (num_warp >= %f * num_stack OR num_stack IS NULL)",
+                           (double)min_frac);
+        }
+        if (havingClause) {
+            psStringAppend(&select, " HAVING %s", havingClause);
+            psFree(havingClause);
+        }
+    }
     psFree(having);
+
 
     if (!p_psDBRunQuery(config->dbh, select)) {
@@ -239 +251 @@
     }
 
+    psArray *list = psArrayAllocEmpty(16); // List of runs, to print
     for (long i = 0; i < output->n; i++) {
         psMetadata *row = output->data[i]; // Row from select
@@ -249 +262 @@
             psFree(output);
             psFree(insert);
+            psFree(list);
             if (!psDBRollback(config->dbh)) {
                 psError(PS_ERR_UNKNOWN, false, "database error");
@@ -260 +274 @@
             psFree(output);
             psFree(insert);
+            psFree(list);
             if (!psDBRollback(config->dbh)) {
                 psError(PS_ERR_UNKNOWN, false, "database error");
@@ -271 +286 @@
             psFree(output);
             psFree(insert);
+            psFree(list);
             if (!psDBRollback(config->dbh)) {
                 psError(PS_ERR_UNKNOWN, false, "database error");
@@ -296 +312 @@
             psFree(run);
             psFree(insert);
+            psFree(list);
             if (!psDBRollback(config->dbh)) {
                 psError(PS_ERR_UNKNOWN, false, "database error");
@@ -306 +323 @@
         run->stack_id = stack_id;
 
-        if (!stackRunPrintObject(stdout, run, !simple)) {
-            psError(PS_ERR_UNKNOWN, false, "failed to print object");
-            psFree(run);
-            psFree(insert);
-            if (!psDBRollback(config->dbh)) {
-                psError(PS_ERR_UNKNOWN, false, "database error");
-            }
-            return false;
-        }
+        psArrayAdd(list, list->n, run);
         psFree(run);
 
@@ -331 +340 @@
             psFree(insert);
             psFree(output);
+            psFree(list);
             if (!psDBRollback(config->dbh)) {
                 psError(PS_ERR_UNKNOWN, false, "database error");
@@ -338 +348 @@
         psFree(thisInsert);
     }
+    psFree(output);
 
     if (!psDBCommit(config->dbh)) {
         psError(PS_ERR_UNKNOWN, false, "database error");
-        return false;
-    }
-
-    psFree(output);
+        psFree(list);
+        return false;
+    }
+
+    if (!stackRunPrintObjects(stdout, list, !simple)) {
+        psError(PS_ERR_UNKNOWN, false, "failed to print object");
+        return false;
+    }
+
+    psFree(list);
 
     return true;