Changeset 12177

Timestamp:

Mar 1, 2007, 5:47:00 PM (19 years ago)

Author:

jhoblitt

Message:

add chipQueueRawExp() and remove dead code that it can be used in place of

Location:

trunk/ippTools/src

Files:

• Makefile.am (modified) (1 diff)
• chipqueue.c (added)
• chiptool.c (modified) (1 diff)
• chiptool.h (modified) (1 diff)
• regtool.c (modified) (5 diffs)

trunk/ippTools/src/Makefile.am

@@ -50 +50 @@
         pxdata.c \
         pxio.c \
-        pxtag.c
+        pxtag.c \
+        chipqueuerawexp.c
 
 # for pxtools.h

trunk/ippTools/src/chiptool.c

@@ -251 +251 @@
 
         // queue the exp
-        if (!p_psDBRunQuery(config->dbh, queuerawexp_query,
-                    label    ? label    : "NULL",
-                    recipe   ? recipe   : "NULL",
-                    expgroup ? expgroup : "NULL",
-                    dvodb    ? dvodb    : "NULL",
-                    exp_tag
-        )) {
-            psError(PS_ERR_UNKNOWN, false, "database error");
-            psFree(queuerawimfile_query);
-            psFree(queuerawexp_query);
-            psFree(output);
-            return false;
-        }
-
-        // just to be safe, we should have changed at least one row
-        if (psDBAffectedRows(config->dbh) < 1) {
+        if (!chipQueueRawExp(config, exp_tag, label, recipe, expgroup, dvodb)) {
             if (!psDBRollback(config->dbh)) {
                 psError(PS_ERR_UNKNOWN, false, "database error");
             }
             psError(PS_ERR_UNKNOWN, false,
-                    "no rows affected - should have changed at least one row");
-            psFree(queuerawimfile_query);
-            psFree(queuerawexp_query);
-            psFree(output);
-            return false;
-        }
-
-        // queue the imfiles for the exp we just queued
-        if (!p_psDBRunQuery(config->dbh, queuerawimfile_query)) {
-            psError(PS_ERR_UNKNOWN, false, "database error");
-            psFree(queuerawimfile_query);
-            psFree(queuerawexp_query);
-            psFree(output);
-            return false;
-        }
-
-        // just to be safe, we should have changed at least one row
-        if (psDBAffectedRows(config->dbh) < 1) {
-            if (!psDBRollback(config->dbh)) {
-                psError(PS_ERR_UNKNOWN, false, "database error");
-            }
-            psError(PS_ERR_UNKNOWN, false,
-                    "no rows affected - should have changed at least one row");
+                    "failed to trying to queue exp_tag: %s", exp_tag);
             psFree(queuerawimfile_query);
             psFree(queuerawexp_query);

trunk/ippTools/src/chiptool.h

@@ -37 +37 @@
 pxConfig *chiptoolConfig(pxConfig *config, int argc, char **argv);
 
+bool chipQueueRawExp(pxConfig *config, psString exp_tag, psString label, psString recipe, psString expgroup, psString dvodb);
+
 #endif // CHIPTOOL_H

trunk/ippTools/src/regtool.c

@@ -27 +27 @@
 #include "pxdata.h"
 #include "regtool.h"
+#include "chiptool.h"
 
 static bool pendingimfileMode(pxConfig *config);
@@ -40 +41 @@
 
 // static guidePendingExpRow *newToP1PendingExp(newExpRow *newExp);
-static chipPendingExpRow *newTochipPendingExp(pxConfig *config, newExpRow *newExp);
-static chipPendingImfileRow *rawImfileTochipPendingImfile(pxConfig *config, psS64 chip_id, rawImfileRow *rawImfile);
+//static chipPendingExpRow *newTochipPendingExp(pxConfig *config, newExpRow *newExp);
+//static chipPendingImfileRow *rawImfileTochipPendingImfile(pxConfig *config, psS64 chip_id, rawImfileRow *rawImfile);
 
 static rawExpRow *newToRawExp(pxConfig *config, newExpRow *exp);
@@ -636 +637 @@
         }
 
+        psFree(newExp);
+
         // if this is a detrend image don't put it in the chip queue (and we're
         // done)
         if (detrend) {
-            psFree(newExp);
             continue;
         }
 
         // insert an entry into the chipPendingExp table
-        chipPendingExpRow *chipPendingExp = newTochipPendingExp(config, newExp);
-        if (!chipPendingExp) {
-            psError(PS_ERR_UNKNOWN, false, "failed to convert newExp to chipPendingExp");
-            psFree(newExp);
-            psFree(output);
-            return false;
-        }
-
-        // insert the chipPendingExp object into the database
-        if (!chipPendingExpInsertObject(config->dbh, chipPendingExp)) {
+        if (!chipQueueRawExp(config, exp_tag, NULL, NULL, NULL, NULL)) {
             // rollback
             if (!psDBRollback(config->dbh)) {
                 psError(PS_ERR_UNKNOWN, false, "database error");
             }
-            psError(PS_ERR_UNKNOWN, false, "database error");
-            psFree(chipPendingExp);
-            psFree(newExp);
+            psError(PS_ERR_UNKNOWN, false, "failed to queue chipPendingExp");
             psFree(output);
             return false;
         }
-
-        // get the chip_id for the imfiles
-        psS64 chip_id = psDBLastInsertID(config->dbh);
-        psFree(chipPendingExp);
-
-        // find all of the rawImfiles associated with the chipPendingExp object
-        psArray *rawImfiles = NULL;
-        {
-            // build a query to search by exp_tag
-            psMetadata *where = psMetadataAlloc();
-            if (!psMetadataAddStr(where, PS_LIST_TAIL, "exp_tag", 0, "==", newExp->exp_tag)) {
-                // rollback
-                if (!psDBRollback(config->dbh)) {
-                    psError(PS_ERR_UNKNOWN, false, "database error");
-                }
-                psError(PS_ERR_UNKNOWN, false, "failed to add item exp_tag");
-                psFree(where);
-                psFree(newExp);
-                psFree(output);
-                return false;
-            }
-            rawImfiles = rawImfileSelectRowObjects(config->dbh, where, 0);
-            psFree(where);
-        }
-        // sanity check that least results were found
-        if (!rawImfiles) {
-            // rollback
-            if (!psDBRollback(config->dbh)) {
-                psError(PS_ERR_UNKNOWN, false, "database error");
-            }
-            psError(PS_ERR_UNKNOWN, false, "database error");
-            psFree(newExp);
-            psFree(output);
-            return false;
-        }
-        // sanity check the number of rawImfiles found
-        if (psArrayLength(rawImfiles) != newExp->imfiles) {
-            // rollback
-            if (!psDBRollback(config->dbh)) {
-                psError(PS_ERR_UNKNOWN, false, "database error");
-            }
-            psError(PS_ERR_UNKNOWN, false, "found %ld rawImfiles but expected %d",
-                    psArrayLength(rawImfiles), newExp->imfiles);
-            psFree(newExp);
-            psFree(output);
-            return false;
-        }
-        // convert the rawImfiles into chipPendingImfiles and insert them into
-        // the database
-        for (long i = 0; i < psArrayLength(rawImfiles); i++) {
-            rawImfileRow *rawImfile = rawImfiles->data[i];
-            chipPendingImfileRow *pendingImfile = rawImfileTochipPendingImfile(config, chip_id, rawImfile);
-            if (!chipPendingImfileInsertObject(config->dbh, pendingImfile)){
-                // rollback
-                if (!psDBRollback(config->dbh)) {
-                    psError(PS_ERR_UNKNOWN, false, "database error");
-                }
-                psError(PS_ERR_UNKNOWN, false, "database error");
-                psFree(pendingImfile);
-                psFree(rawImfiles);
-                psFree(newExp);
-                psFree(output);
-            }
-            psFree(pendingImfile);
-        }
-        psFree(rawImfiles);
-        psFree(newExp);
     }
 
@@ -879 +803 @@
 
 
+#if 0
 static chipPendingExpRow *newTochipPendingExp(pxConfig *config, newExpRow *exp)
 {
@@ -914 +839 @@
     );
 }
+#endif