Changeset 12188

Timestamp:

Mar 2, 2007, 12:42:55 PM (19 years ago)

Author:

jhoblitt

Message:

add camQueueChipID and use it where appropriate

Location:

trunk/ippTools

Files:

• scripts/camtest.sh (modified) (1 diff)
• share/Makefile.am (modified) (1 diff)
• share/camtool_queue_chip_id.sql (added)
• src/Makefile.am (modified) (1 diff)
• src/camqueue.c (added)
• src/camtool.c (modified) (3 diffs)
• src/camtool.h (modified) (1 diff)
• src/camtoolConfig.c (modified) (1 diff)
• src/chiptool.c (modified) (4 diffs)

trunk/ippTools/scripts/camtest.sh

@@ -8 +8 @@
 camtool -pendingimfile || exit 1
 
-camtool -addprocessedexp -cam_id 1 -uri file://camp -recip myrecipe -bg 1 -bg_stdev 2 -bg_mean_stdev 3 -sigma_ra 1 -sigma_dec 2 -nastro 42 -path_base file:///foo -zp_mean 1 -zp_stdev 2 || exit 1
-camtool -addprocessedexp -cam_id 2 -uri file://camp -recip myrecipe -bg 1 -bg_stdev 2 -bg_mean_stdev 3 -sigma_ra 1 -sigma_dec 2 -nastro 42 -path_base file:///foo -zp_mean 1 -zp_stdev 2 || exit 1
+camtool -addprocessedexp -cam_id 1 -uri file:///cam -bg 1 -bg_stdev 2 -bg_mean_stdev 3 -sigma_ra 1 -sigma_dec 2 -nastro 42 -path_base file:///foo -zp_mean 1 -zp_stdev 2 || exit 1
+camtool -addprocessedexp -cam_id 2 -uri file:///cam -bg 1 -bg_stdev 2 -bg_mean_stdev 3 -sigma_ra 1 -sigma_dec 2 -nastro 42 -path_base file:///foo -zp_mean 1 -zp_stdev 2 || exit 1

trunk/ippTools/share/Makefile.am

@@ -1 +1 @@
 dist_pkgdata_DATA = \
+        camtool_queue_chip_id.sql \
         chiptool_completely_processed_exp.sql \
+        chiptool_find_rawexp.sql \
         chiptool_find_unprocessed_imfile.pl \
         chiptool_pendingimfile.sql \
         chiptool_processedimfile.sql \
+        chiptool_queuerawexp.sql \
+        chiptool_queuerawimfile.sql \
+        regtool_find_unprocessed_exp.sql \
+        regtool_find_unprocessed_imfile.sql \
+        regtool_pendingexp.sql \
         regtool_pendingimfile.sql \
-        regtool_find_unprocessed_exp.sql \
         regtool_processedexp.sql \
-        regtool_find_unprocessed_imfile.sql \
-        regtool_processedimfile.sql \
-        regtool_pendingexp.sql \
-        chiptool_queuerawexp.sql \
-        chiptool_queuerawimfile.sql
-        chiptool_find_rawexp.sql 
+        regtool_processedimfile.sql

trunk/ippTools/src/Makefile.am

@@ -51 +51 @@
         pxio.c \
         pxtag.c \
-        chipqueuerawexp.c
+        chipqueuerawexp.c \
+        camqueue.c
 
 # for pxtools.h

trunk/ippTools/src/camtool.c

@@ -293 +293 @@
     }
 
-    psString recipe = psMetadataLookupStr(&status, config->args, "-recip");
-    if (!status) {
-        psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -recip");
-        return false;
-    }
-    if (!recipe) {
-        psError(PS_ERR_UNKNOWN, true, "-recip is required");
-        return false;
-    }
-
     psF64 bg = psMetadataLookupF64(&status, config->args, "-bg");
     if (!status) {
@@ -428 +418 @@
         pendingRow->chip_id,
         pendingRow->label,
+        pendingRow->recipe,
+        pendingRow->expgroup,
+        pendingRow->dvodb,
         uri,
-        recipe,
         bg,
         bg_stdev,
@@ -439 +431 @@
         zp_mean,
         zp_stdev,
-        code,
-        pendingRow->expgroup,
-        pendingRow->dvodb
+        code
     );
 

trunk/ippTools/src/camtool.h

@@ -37 +37 @@
 pxConfig *camtoolConfig(pxConfig *config, int argc, char **argv);
 
+bool camQueueChipID(pxConfig *config,
+                    psS64 chip_id,
+                    psString label,
+                    psString recipe,
+                    psString expgroup,
+                    psString dvodb);
+
 #endif // CAMTOOL_H

trunk/ippTools/src/camtoolConfig.c

@@ -78 +78 @@
     psMetadataAddStr(addprocessedexpArgs, PS_LIST_TAIL, "-uri", 0,
             "define URI (required)", NULL);
-    psMetadataAddStr(addprocessedexpArgs, PS_LIST_TAIL, "-recip",  0,
-            "define recipe (required)", NULL);
     psMetadataAddF64(addprocessedexpArgs, PS_LIST_TAIL, "-bg", 0,
             "define exposue background (required)", NAN);

trunk/ippTools/src/chiptool.c

@@ -29 +29 @@
 #include "pxdata.h"
 #include "chiptool.h"
+#include "camtool.h"
 
 static bool queuerawexpMode(pxConfig *config);
@@ -41 +42 @@
 static chipProcessedImfileRow *chipPendingToProcessedImfile(pxConfig *config, chipPendingImfileRow *imfile);
 static chipProcessedExpRow *chipPendingToProcessedExp(pxConfig *config, chipPendingExpRow *pendingExp);
-static camPendingExpRow *chipPendingTocamPendingExp(pxConfig *config, chipPendingExpRow *pendingExp);
 static bool chipProcessedCompleteExp(pxConfig *config);
 
@@ -748 +748 @@
     for (long i = 0; i < psArrayLength(output); i++) {
         psMetadata *row = output->data[i];
+
         // convert metadata into a chipPendingExp object
-        chipPendingExpRow *object = chipPendingExpObjectFromMetadata(row);
-        // do both *Exp type conversion first so we don't insert one and then
-        // have to rollback the change as the 2nd failed
+        chipPendingExpRow *pendingExp = chipPendingExpObjectFromMetadata(row);
+        if (!pendingExp) {
+            psError(PS_ERR_UNKNOWN, false, "failed to convert metadata into chipPendingExp");
+            psFree(output);
+            return false;
+        }
+
         // convert chipPendingExp object into a chipProcesseExp object
-        chipProcessedExpRow *processedExp = chipPendingToProcessedExp(config, object);
+        chipProcessedExpRow *processedExp = chipPendingToProcessedExp(config, pendingExp);
         if (!processedExp) {
             psError(PS_ERR_UNKNOWN, false, "failed to convert chipPendingExp to chipProcessedExp");
-            psFree(object);
-            psFree(output);
-            return false;
-        }
-        // convert chipPendingExp object into a camPendingExp object
-        camPendingExpRow *pendingExp = chipPendingTocamPendingExp(config, object);
-        if (!processedExp) {
-            psError(PS_ERR_UNKNOWN, false, "failed to convert chipPendingExp to camPendingExp");
+            psFree(pendingExp);
+            psFree(output);
+            return false;
+        }
+
+        // delete the chipPendingExp object from the database
+        if (!chipPendingExpDeleteObject(config->dbh, pendingExp)) {
+            // there must be atleast 1 Imfile to get this far
+            psError(PS_ERR_UNKNOWN, false, "database error");
             psFree(processedExp);
-            psFree(object);
-            psFree(output);
-            return false;
-        }
+            psFree(pendingExp);
+            psFree(output);
+            return false;
+        }
+        psFree(pendingExp);
+
         // insert chipProccessedExp object into the database
         if (!chipProcessedExpInsertObject(config->dbh, processedExp)) {
             psError(PS_ERR_UNKNOWN, false, "database error");
             psFree(processedExp);
-            psFree(pendingExp);
-            psFree(object);
-            psFree(output);
-            return false;
-        }
+            psFree(output);
+            return false;
+        }
+
+        // camQueueChipID() can only be run after the chipProcessedExp entry
+        // has been inserted.
+        // queue the chip_id in the camPendingExp table 
+        if (!camQueueChipID(config,
+                    processedExp->chip_id,
+                    processedExp->label,
+                    processedExp->recipe,
+                    processedExp->expgroup,
+                    processedExp->dvodb
+        )) {
+            // rollback
+            if (!psDBRollback(config->dbh)) {
+                psError(PS_ERR_UNKNOWN, false, "database error");
+            }
+            psError(PS_ERR_UNKNOWN, false, "failed to queue camPendingExp");
+            psFree(processedExp);
+            psFree(output);
+            return false;
+        }
+
         psFree(processedExp);
-        // insert camPendingExp object into the database
-        if (!camPendingExpInsertObject(config->dbh, pendingExp)) {
-            psError(PS_ERR_UNKNOWN, false, "database error");
-            psFree(pendingExp);
-            psFree(object);
-            psFree(output);
-            return false;
-        }
-        psFree(pendingExp);
-        // delete the chipPendingExp object from the database
-        if (!chipPendingExpDeleteObject(config->dbh, object)) {
-            // there must be atleast 1 Imfile to get this far
-            psError(PS_ERR_UNKNOWN, false, "database error");
-            psFree(object);
-            psFree(output);
-            return false;
-        }
-        psFree(object);
     }
 
@@ -875 +884 @@
         pendingExp->guide_id,
         pendingExp->label,
+        pendingExp->recipe,
         pendingExp->expgroup,
         pendingExp->dvodb
     );
 }
-
-
-static camPendingExpRow *chipPendingTocamPendingExp(pxConfig *config, chipPendingExpRow *pendingExp)
-{
-    PS_ASSERT_PTR_NON_NULL(pendingExp, NULL);
-
-    return camPendingExpRowAlloc(
-        0,                      // cam version, assigned by db
-        pendingExp->chip_id,
-        pendingExp->label,
-        pendingExp->expgroup,
-        pendingExp->dvodb
-    );
-}