Changeset 13996

Timestamp:

Jul 2, 2007, 3:57:20 PM (19 years ago)

Author:

jhoblitt

Message:

merge chipqueue.c -> pxchip.c
merge camqueue.c -> pxcam.c

Location:

branches/backtrack/ippTools/src

Files:

• Makefile.am (modified) (1 diff)
• camqueue.c (deleted)
• camtool.c (modified) (1 diff)
• camtool.h (modified) (1 diff)
• chipqueue.c (deleted)
• chiptool.c (modified) (2 diffs)
• chiptool.h (modified) (1 diff)
• pxchip.c (modified) (2 diffs)
• pxchip.h (modified) (1 diff)
• regtool.c (modified) (1 diff)

branches/backtrack/ippTools/src/Makefile.am

@@ -57 +57 @@
         pxregister.c \
         pxchip.c \
-        pxcam.c \
-        chipqueue.c \
-        camqueue.c
+        pxcam.c
 
 # for pxtools.h

branches/backtrack/ippTools/src/camtool.c

@@ -258 +258 @@
 
         // queue the exp
-        if (!camQueueChipID(config,
+        if (!pxcamQueueByChipID(config,
                     row->chip_id,
                     workdir     ? workdir   : row->workdir,

branches/backtrack/ippTools/src/camtool.h

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

branches/backtrack/ippTools/src/chiptool.c

@@ -242 +242 @@
 
         // queue the exp
-        if (!chipQueueExpTag(config, exp_tag, workdir, label, reduction, expgroup, dvodb)) {
+        if (!pxchipQueueByExpTag(config, exp_tag, workdir, label, reduction, expgroup, dvodb)) {
             if (!psDBRollback(config->dbh)) {
                 psError(PS_ERR_UNKNOWN, false, "database error");
@@ -844 +844 @@
         // camQueueChipID() can only be run after chipRun.state has been set to
         // stop
-        if (!camQueueChipID(config,
+        if (!pxcamQueueByChipID(config,
                     chipRun->chip_id,
                     chipRun->workdir,

branches/backtrack/ippTools/src/chiptool.h

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

branches/backtrack/ippTools/src/pxchip.c

@@ -2 +2 @@
  * pxchip.c
  *
- * Copyright (C) 2006  Joshua Hoblitt
+ * Copyright (C) 2007  Joshua Hoblitt
  *
  * This program is free software; you can redistribute it and/or modify it
@@ -54 +54 @@
     return true;
 }
+
+
+bool pxchipQueueByExpTag(pxConfig *config,
+                         psString exp_tag,
+                         psString workdir,
+                         psString label,
+                         psString reduction,
+                         psString expgroup,
+                         psString dvodb)
+{
+    PS_ASSERT_PTR_NON_NULL(config, false);
+
+    // start a transaction
+    if (!psDBTransaction(config->dbh)) {
+        psError(PS_ERR_UNKNOWN, false, "database error");
+        return false;
+    }
+    
+    // create a chipRun
+    if (!chipRunInsert(config->dbh,
+            0x0,
+            "run",      // state                
+            workdir,
+            "dirty",    // workdir_state
+            label,
+            reduction,
+            expgroup,
+            dvodb)
+    ) {
+        // rollback
+        if (!psDBRollback(config->dbh)) {
+            psError(PS_ERR_UNKNOWN, false, "database error");
+        }
+        psError(PS_ERR_UNKNOWN, false, "database error");
+        return false;
+    }
+
+#if 0
+    // get the chip_id
+    long chip_id = psDBLastInsertID(config->dbh);
+#endif
+
+    // populate the chipPendingImfile table from rawImfile based on exp_tag,
+    // where the coresponding newExp.state entry is set to stop
+    psString query = pxDataGetCached("chiptool_queuerawimfile.sql");
+    if (!query) {
+        psError(PXTOOLS_ERR_DATA, false, "failed to retreive SQL statement");
+        return false;
+    }
+
+    // queue the imfiles for the exp_tag
+    if (!p_psDBRunQuery(config->dbh, query, exp_tag)) {
+        psError(PS_ERR_UNKNOWN, false, "database error");
+        return false;
+    }
+
+    // just to be safe, we should have changed at least one row
+    if (psDBAffectedRows(config->dbh) < 1) {
+        psError(PS_ERR_UNKNOWN, false,
+                "no rows affected - should have changed at least one row");
+        return false;
+    }
+
+    // point of no return
+    if (!psDBCommit(config->dbh)) {
+        psError(PS_ERR_UNKNOWN, false, "database error");
+        return false;
+    }
+
+    return true;
+}

branches/backtrack/ippTools/src/pxchip.h

@@ -27 +27 @@
 bool pxchipRunSetState(pxConfig *config, psS64 chip_id, const char *state);
 
+bool pxchipQueueByExpTag(pxConfig *config,
+                         psString exp_tag,
+                         psString workdir,
+                         psString label,
+                         psString recipe,
+                         psString expgroup,
+                         psString dvodb);
+
 #endif // PXCHIP_H

branches/backtrack/ippTools/src/regtool.c

@@ -634 +634 @@
         // insert an entry into the chipPendingExp table
         // this can only be run as the newExp's state has been set to stop
-        if (!chipQueueExpTag(config, exp_tag, NULL, NULL, NULL, NULL, NULL)) {
+        if (!pxchipQueueByExpTag(config, exp_tag, NULL, NULL, NULL, NULL, NULL)) {
             // rollback
             if (!psDBRollback(config->dbh)) {