Changeset 35096 for branches/eam_branches/ipp-20121219/ippTools/src/staticskytool.c

Timestamp:

Feb 6, 2013, 2:34:49 PM (13 years ago)

Author:

eugene

Message:

merging changes from trunk

Location:

branches/eam_branches/ipp-20121219

Files:

• . (modified) (1 prop)
• ippTools/src (modified) (2 props)
• ippTools/src/staticskytool.c (modified) (5 diffs)

branches/eam_branches/ipp-20121219/ippTools/src

@@ -46 +46 @@
 vptool
 sctool
+releasetool

@@ -46 +46 @@
 vptool
 sctool
+releasetool

branches/eam_branches/ipp-20121219/ippTools/src/staticskytool.c

@@ -503 +503 @@
     PXOPT_COPY_S64(config->args, whereMD, "-sky_id", "sky_id", "==");
     pxAddLabelSearchArgs (config, whereMD, "-label", "staticskyRun.label", "==");
+    pxskycellAddWhere(config, whereMD);
 
     PXOPT_LOOKUP_U64(limit, config->args, "-limit", false, false);
@@ -736 +737 @@
     PXOPT_COPY_S16(config->args, where, "-fault", "staticskyResult.fault", "==");
 
+    if (!pxskycellAddWhere(config, where)) {
+        psError(PXTOOLS_ERR_CONFIG, false, "failed to add skycell search arguments");
+        return false;
+    }
+
     if (!psListLength(where->list) && !psMetadataLookupBool(NULL, config->args, "-all")) {
         psFree(where);
@@ -1066 +1072 @@
     psFree(whereMD);
 
+    psString labelHook = psStringCopy("");
     if (!rerun) {
         if (label)  {
-            psStringAppend(&query, "\nAND (skycalRun.label IS NULL OR skycalRun.label = '%s')", label);
+            psStringAppend(&labelHook, "\nAND skycalRun.label = '%s'", label);
         }
         psStringAppend(&query, "\nAND skycal_id IS NULL");
     }
 
-    if (!p_psDBRunQuery(config->dbh, query)) {
+
+    if (!p_psDBRunQueryF(config->dbh, query, labelHook)) {
         psError(PS_ERR_UNKNOWN, false, "database error");
+        psFree(labelHook);
         psFree(query);
         return false;
     }
+    psFree(labelHook);
     psFree(query);
 
@@ -1392 +1402 @@
     PXOPT_COPY_STR(config->args, where, "-label",      "skycalRun.label", "==");
     PXOPT_COPY_STR(config->args, where, "-data_group", "skycalRun.data_group", "LIKE");
+    PXOPT_COPY_S16(config->args, where, "-quality",     "skycalResult.quality", "==");
     PXOPT_COPY_S16(config->args, where, "-fault",      "skycalResult.fault", "==");
+
+    if (!pxskycellAddWhere(config, where)) {
+        psError(PXTOOLS_ERR_CONFIG, false, "failed to add skycell search arguments");
+        return false;
+    }
 
     PXOPT_LOOKUP_U64(limit, config->args, "-limit", false, false);
@@ -1468 +1484 @@
     pxAddLabelSearchArgs(config, where, "-filter", "stackRun.filter", "==");
     PXOPT_COPY_S16(config->args, where, "-fault", "skycalResult.fault", "==");
+    if (!pxskycellAddWhere(config, where)) {
+        psError(PXTOOLS_ERR_CONFIG, false, "failed to add skycell search arguments");
+        return false;
+    }
 
     if (!psListLength(where->list) && !psMetadataLookupBool(NULL, config->args, "-all")) {

@@ -46 +46 @@
 vptool
 sctool
+releasetool