Changeset 31918

Timestamp:

Jul 21, 2011, 4:19:26 PM (15 years ago)

Author:

watersc1

Message:

Fix missing exposure problem when astrometry fails.

Location:

tags/ipp-20110622/ippTools

Files:

• share/dqstatstool_definebyquery.sql (modified) (1 diff)
• src/dqstatstool.c (modified) (2 diffs)

tags/ipp-20110622/ippTools/share/dqstatstool_definebyquery.sql

@@ -4 +4 @@
         JOIN chipRun USING(exp_id) 
         JOIN camRun USING(chip_id) 
+        JOIN camProcessedExp USING(cam_id)
         LEFT OUTER JOIN fakeRun USING(cam_id) 
         LEFT OUTER JOIN warpRun USING(fake_id)

tags/ipp-20110622/ippTools/src/dqstatstool.c

@@ -92 +92 @@
   }
   else {
-    psStringAppend(&query, " AND (warp_id IS NOT NULL AND invalid IS NULL) ");
+    psStringAppend(&query, " AND ((warp_id IS NOT NULL OR camProcessedExp.quality > 0) AND invalid IS NULL) ");
   }
 
@@ -622 +622 @@
       }
       else if (!strcmp(colType,"PS_DATA_STRING")) {
-        if (rowItem->data.str) {
-            success = psMetadataAddStr(tableRow,PS_LIST_TAIL,colName,0,"",rowItem->data.str);
-        } else {
+        if (rowItem->data.str == NULL) {
+            // psFits blows up on a string with a null value.
+            // Arguably I should fix psLib.db should handle this
             rowItem->data.str = psStringCopy("NULL");
-            success = psMetadataAddStr(tableRow,PS_LIST_TAIL,colName,0,"",rowItem->data.str);
         }
+        success = psMetadataAddStr(tableRow,PS_LIST_TAIL,colName,0,"",rowItem->data.str);
       }
       else if (!strcmp(colType,"PS_DATA_TIME")) {