Changeset 31409

Timestamp:

Apr 29, 2011, 2:33:48 PM (15 years ago)

Author:

watersc1

Message:

Finished with laptool (for now at least), as it seems to be working properly. Change to psDB.c adds some more information to help debug 'type lookup failed.' errors.

Location:

branches/czw_branch/20110406

Files:

• ippTools/share/laptool_exposures.sql (modified) (2 diffs)
• ippTools/share/laptool_inactiveexp.sql (modified) (2 diffs)
• ippTools/src/laptool.c (modified) (2 diffs)
• ippTools/src/laptoolConfig.c (modified) (2 diffs)
• psLib/src/db/psDB.c (modified) (1 diff)

branches/czw_branch/20110406/ippTools/share/laptool_exposures.sql

@@ -1 +1 @@
 SELECT DISTINCT 
-    D.*,diffRun.state,sum(others.private) AS needs_remade FROM (
+    D.*,diffRun.state,
+    CONVERT(sum(others.private),SIGNED) AS needs_remade 
+--      0 AS needs_remade
+    FROM (
   SELECT DISTINCT 
-      W.*,IFNULL(diff1.diff_id,diff2.diff_id) AS diff_id FROM (
+      W.*,CONVERT(IFNULL(diff1.diff_id,diff2.diff_id),SIGNED) AS diff_id FROM (
     SELECT DISTINCT
         lap_id,lapRun.tess_id,projection_cell,filter,lapRun.state as lapRun_state, lapRun.registered, lapRun.fault, lapRun.label,
         lapExp.exp_id,lapExp.chip_id,lapExp.pair_id,private,pairwise,active,lapExp.data_state,
-        chipRun.state as chipRun_state, sum(chipProcessedImfile.fault) as chip_faults, sum(chipProcessedImfile.quality) as chip_quality,
-        camRun.cam_id, camRun.state as camRun_state,   sum(camProcessedExp.fault) AS cam_faults, sum(camProcessedExp.quality) AS cam_quality,
-        fakeRun.fake_id, fakeRun.state as fakeRun_state, sum(fakeProcessedImfile.fault) as fake_faults,
-        warpRun.warp_id, warpRun.state as warpRun_state, sum(warpSkyfile.fault) as warp_faults, sum(warpSkyfile.quality) as warp_quality,
+        chipRun.state as chipRun_state, 
+        CONVERT(sum(chipProcessedImfile.fault),SIGNED) as chip_faults, 
+        CONVERT(sum(chipProcessedImfile.quality),SIGNED) as chip_quality,
+        camRun.cam_id, camRun.state as camRun_state,   
+        CONVERT(sum(camProcessedExp.fault),SIGNED) AS cam_faults, 
+        CONVERT(sum(camProcessedExp.quality),SIGNED) AS cam_quality,
+        fakeRun.fake_id, fakeRun.state as fakeRun_state, 
+        CONVERT(sum(fakeProcessedImfile.fault),SIGNED) as fake_faults,
+        warpRun.warp_id, warpRun.state as warpRun_state, 
+        CONVERT(sum(warpSkyfile.fault),SIGNED) as warp_faults, 
+        CONVERT(sum(warpSkyfile.quality),SIGNED) as warp_quality,
         warpRun.magicked
     FROM lapRun JOIN lapExp USING(lap_id)
@@ -28 +38 @@
 LEFT JOIN diffRun USING(diff_id)
 JOIN lapExp AS others ON (D.chip_id = others.chip_id AND D.lap_id != others.lap_id)
-GROUP BY lap_id,exp_id
+

branches/czw_branch/20110406/ippTools/share/laptool_inactiveexp.sql

@@ -1 +1 @@
 SELECT DISTINCT 
-    D.*,diffRun.state,sum(others.active) AS is_in_use FROM (
+    D.*,diffRun.state AS diff_state,CONVERT(sum(others.active),SIGNED) AS is_in_use FROM (
   SELECT DISTINCT 
       W.*,IFNULL(diff1.diff_id,diff2.diff_id) AS diff_id FROM (
@@ -7 +7 @@
         lapRun.dist_group, lapRun.registered, lapRun.fault, lapRun.quick_sass_id, lapRun.final_sass_id,
         lapExp.exp_id,lapExp.chip_id,lapExp.pair_id,private,pairwise,active,lapExp.data_state,
-        chipRun.state as chipRun_state, sum(chipProcessedImfile.fault) as chip_faults, sum(chipProcessedImfile.quality) as chip_quality,
-        cam_id, camRun.state as camRun_state,   sum(camProcessedExp.fault) AS cam_faults, sum(camProcessedExp.quality) AS cam_quality,
-        fake_id, fakeRun.state as fakeRun_state, sum(fakeProcessedImfile.fault) as fake_faults,
-        warp_id, warpRun.state as warpRun_state, sum(warpSkyfile.fault) as warp_faults, sum(warpSkyfile.quality) as warp_quality,
+        chipRun.state as chipRun_state, 
+        CONVERT(sum(chipProcessedImfile.fault),SIGNED) as chip_faults, 
+        CONVERT(sum(chipProcessedImfile.quality),SIGNED) as chip_quality,
+        camRun.cam_id, camRun.state as camRun_state,   
+        CONVERT(sum(camProcessedExp.fault),SIGNED) AS cam_faults, 
+        CONVERT(sum(camProcessedExp.quality),SIGNED) AS cam_quality,
+        fakeRun.fake_id, fakeRun.state as fakeRun_state, 
+        CONVERT(sum(fakeProcessedImfile.fault),SIGNED) as fake_faults,
+        warpRun.warp_id, warpRun.state as warpRun_state, 
+        CONVERT(sum(warpSkyfile.fault),SIGNED) as warp_faults, 
+        CONVERT(sum(warpSkyfile.quality),SIGNED) as warp_quality,
         warpRun.magicked
     FROM lapRun JOIN lapExp USING(lap_id)

branches/czw_branch/20110406/ippTools/src/laptool.c

@@ -708 +708 @@
   PXOPT_COPY_S64(config->args, where, "-exp_id", "exp_id", "==");
   PXOPT_COPY_S64(config->args, where, "-chip_id", "chip_id", "==");
+  PXOPT_COPY_STR(config->args, where, "-set_data_state", "data_state", "==");
 
   psMetadata *values = psMetadataAlloc();
@@ -717 +718 @@
   }
   if (private) {
-    psMetadataAddBool(values, PS_LIST_TAIL, "private", 1, "", false);
+    psMetadataAddBool(values, PS_LIST_TAIL, "private", 0, "==", true);
   }
   else if (public) {
-    psMetadataAddBool(values, PS_LIST_TAIL, "private", 0, "", false);
+    psMetadataAddBool(values, PS_LIST_TAIL, "private", 0, "==", false);
   }
   if (active) {
-    psMetadataAddBool(values, PS_LIST_TAIL, "active", 1, "", false);
+    psMetadataAddBool(values, PS_LIST_TAIL, "active", 0, "==", true);
   }
   else if (inactive) {
-    psMetadataAddBool(values, PS_LIST_TAIL, "active", 0, "", false);
+    psMetadataAddBool(values, PS_LIST_TAIL, "active", 0, "==", false);
   }
   if (pairwise) {
-    psMetadataAddBool(values, PS_LIST_TAIL, "pairwise", 1, "", false);
+    psMetadataAddBool(values, PS_LIST_TAIL, "pairwise", 0, "==", true);
   }
   else if (nopairwise) {
-    psMetadataAddBool(values, PS_LIST_TAIL, "pairwise", 0, "", false);
+    psMetadataAddBool(values, PS_LIST_TAIL, "pairwise", 0, "==", false);
   }
   

branches/czw_branch/20110406/ippTools/src/laptoolConfig.c

@@ -73 +73 @@
   ADD_OPT(Str, pendingrunArgs, "-fault",                      "search by LAP run fault", NULL);
   ADD_OPT(Bool,pendingrunArgs, "-simple",                     "use the simple output format", false);
+
   // -updaterun
   psMetadata *updaterunArgs = psMetadataAlloc();
@@ -110 +111 @@
   ADD_OPT(S64, updateexpArgs, "-set_chip_id",                 "set the chip ID", 0);
   ADD_OPT(S64, updateexpArgs, "-set_pair_id",                 "set the pair ID", 0);
+  ADD_OPT(Str, updateexpArgs, "-set_data_state",              "set the lapExp data_state", NULL);
   ADD_OPT(Bool,updateexpArgs, "-private",                     "set this exposure as private", 0);
   ADD_OPT(Bool,updateexpArgs, "-public",                      "set this exposure as public", 0);

branches/czw_branch/20110406/psLib/src/db/psDB.c

@@ -1043 +1043 @@
         pType = psDBMySQLToPType(field[i].type, field[i].flags);
         if (!pType) {
-          psError(PS_ERR_UNKNOWN, false, "Failed to lookup type.");
+          psError(PS_ERR_UNKNOWN, false, "Failed to lookup type. %d %d %d",i,field[i].type, field[i].flags);
           psFree(md);
           mysql_free_result(result);