Changeset 31689 for trunk/ippTools

Timestamp:

Jun 22, 2011, 4:28:09 PM (15 years ago)

Author:

bills

Message:

If -group_by_data_group group the inputs by data_group. Also in this mode if -select_data_group is not supplied on the comand line use the inputs'

Location:

trunk/ippTools

Files:

• share/staticskytool_definebyquery_inputs.sql (modified) (1 diff)
• src/staticskytool.c (modified) (2 diffs)

trunk/ippTools/share/staticskytool_definebyquery_inputs.sql

@@ -11 +11 @@
       AND stackRun.tess_id = '%s'
       AND stackRun.skycell_id = '%s'
-  -- WHERE hook %s
+  -- WHERE hook 1 %s
+  -- WHERE hook 2 %s
   GROUP BY stackRun.filter

trunk/ippTools/src/staticskytool.c

@@ -242 +242 @@
             return false;
         }
+        psString by_data_group = NULL;
+        psString stack_data_group = NULL;
+        if (group_by_data_group) {
+            stack_data_group = psMetadataLookupStr(&status, row, "data_group");
+            if (!status) {
+                psError(PS_ERR_UNKNOWN, false, "failed to lookup tess_id");
+                psFree(output);
+                psFree(inputsSQL);
+                if (!psDBRollback(config->dbh)) {
+                    psError(PS_ERR_UNKNOWN, false, "database error");
+                }
+                return false;
+            }
+            psStringAppend(&by_data_group, " AND stackRun.data_group = '%s'", stack_data_group);
+        }
 
         // query for the inputs
-        if (!p_psDBRunQueryF(config->dbh, inputsSQL, tess_id, skycell_id, where)) {
+        if (!p_psDBRunQueryF(config->dbh, inputsSQL, tess_id, skycell_id, where, 
+                                                        by_data_group ? by_data_group : "")) {
             psError(PS_ERR_UNKNOWN, false, "database error");
             psFree(output);
@@ -302 +318 @@
                                 workdir,
                                 label,
-                                data_group ? data_group : label,
+                                data_group ? data_group : (stack_data_group ? stack_data_group : label),
                                 dist_group,
                                 reduction,