Changeset 12131 for trunk/ippTools/src/regtool.c

Timestamp:

Feb 28, 2007, 6:44:37 PM (19 years ago)

Author:

jhoblitt

Message:

rename all *_version fields to be *_id
change chip* tables to use a chip_id
change cam* tables to use a cam_id
change all *_id fields to be S64

File:

• trunk/ippTools/src/regtool.c (modified) (5 diffs)

trunk/ippTools/src/regtool.c

@@ -41 +41 @@
 // static guidePendingExpRow *newToP1PendingExp(newExpRow *newExp);
 static chipPendingExpRow *newTochipPendingExp(pxConfig *config, newExpRow *newExp);
-static chipPendingImfileRow *rawImfileTochipPendingImfile(pxConfig *config, rawImfileRow *rawImfile);
+static chipPendingImfileRow *rawImfileTochipPendingImfile(pxConfig *config, psS64 chip_id, rawImfileRow *rawImfile);
 
 static rawExpRow *newToRawExp(pxConfig *config, newExpRow *exp);
@@ -664 +664 @@
             return false;
         }
+
+        // get the chip_id for the imfiles
+        psS64 chip_id = psDBLastInsertID(config->dbh);
         psFree(chipPendingExp);
 
@@ -712 +715 @@
         for (long i = 0; i < psArrayLength(rawImfiles); i++) {
             rawImfileRow *rawImfile = rawImfiles->data[i];
-            chipPendingImfileRow *pendingImfile = rawImfileTochipPendingImfile(config, rawImfile);
+            chipPendingImfileRow *pendingImfile = rawImfileTochipPendingImfile(config, chip_id, rawImfile);
             if (!chipPendingImfileInsertObject(config->dbh, pendingImfile)){
                 // rollback
@@ -890 +893 @@
 
     chipPendingExpRow *chipExp = chipPendingExpRowAlloc(
-        exp->exp_tag,
-        0x0,            // chip version XXX calc version number
-        0xdeadbeef,     // guide version
-        label,
-        "my recipe",
-        NULL,           // groupa
-        NULL            // dvodb
+            0,              // chip ID, assigned by db
+            exp->exp_tag,
+            0xdeadbeef,     // guide version
+            label,
+            "my recipe",    // recipe
+            NULL,           // expgroup
+            NULL            // dvodb
     );
 
@@ -903 +906 @@
 
 
-static chipPendingImfileRow *rawImfileTochipPendingImfile(pxConfig *config, rawImfileRow *rawImfile)
+static chipPendingImfileRow *rawImfileTochipPendingImfile(pxConfig *config, psS64 chip_id, rawImfileRow *rawImfile)
 {
     return chipPendingImfileRowAlloc(
-        rawImfile->exp_tag,
-        0x0,          // chip version XXX calc version number
-        0xdeadbeef,   // guide version
-        rawImfile->class_id,
-        "my recipe",
-        rawImfile->uri
+            chip_id,
+            rawImfile->exp_tag,
+            0xdeadbeef,     // guide version
+            rawImfile->class_id,
+            "my recipe",    // recipe
+            rawImfile->uri
     );
 }