Changeset 35856

Timestamp:

Jul 25, 2013, 4:05:32 PM (13 years ago)

Author:

watersc1

Message:

Better blocking in stack summary stage

Location:

trunk/ippTools

Files:

• share/stacktool_tosummary.sql (modified) (2 diffs)
• src/stacktool.c (modified) (2 diffs)

trunk/ippTools/share/stacktool_tosummary.sql

@@ -1 @@
-SELECT DISTINCT sass_id,rawExp.camera,stackRun.workdir,stackRun.tess_id,stackRun.state
+SELECT sass_id,camera,workdir,tess_id,state FROM 
+(SELECT sass_id,rawExp.camera,stackRun.workdir,stackRun.tess_id,stackRun.state,
+       sum((stackRun.state = 'full')) AS is_done, sum(1) AS is_defined
        FROM stackRun
        JOIN stackInputSkyfile ON stackRun.stack_id = stackInputSkyfile.stack_id
@@ -12 +14 @@
 WHERE stackRun.state = 'full' AND
       stackSummary.projection_cell IS NULL
+-- WHERE HOOK %s
+GROUP BY sass_id
+) AS T
+WHERE is_done = is_defined

trunk/ippTools/src/stacktool.c

@@ -1475 +1475 @@
   // generate where strings for arguments that require extra processing
   // beyond PXOPT_COPY*
+  psString whereClause;
   if (psListLength(where->list)) {
-    psString whereClause = psDBGenerateWhereConditionSQL(where, NULL);
-    psStringAppend(&query, " AND %s", whereClause);
-    psFree(whereClause);
+    whereClause = psDBGenerateWhereConditionSQL(where, NULL);
+    psStringPrepend(&whereClause, "\n AND ");
   } else if (!all) {
     psError(PXTOOLS_ERR_CONFIG, true, "search parameters or -all are required");
+    psFree(whereClause);
     return false;
   }
@@ -1493 +1494 @@
   }
 
-  if (!p_psDBRunQuery(config->dbh, query)) {
+  if (!p_psDBRunQueryF(config->dbh, query, whereClause)) {
     psError(PS_ERR_UNKNOWN, false, "database error");
+    psFree(whereClause);
     psFree(query);
     return false;
   }
+  psFree(whereClause);
   psFree(query);