Changeset 12177 for trunk/ippTools/src/chiptool.c

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

File:

• trunk/ippTools/src/chiptool.c (modified) (1 diff)

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);