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

Timestamp:

May 20, 2010, 4:37:23 PM (16 years ago)

Author:

watersc1

Message:

Fix unpopulated skyfile bug (hopefully)

File:

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

trunk/ippTools/src/chiptool.c

@@ -1430 +1430 @@
 
         // Set chipRun.software_ver to the appropriate value
-        if (!pxSetRunSoftware(config, "chipRun", "chip_id", chip_id, software_ver)) {
-          psError(PS_ERR_UNKNOWN, false, "failed to set chipRun.software_ver for chip_id: %" PRId64,
-                  chip_id);
-          psFree(output);
-          if (!psDBRollback(config->dbh)) {
-            psError(PS_ERR_UNKNOWN, false, "database error");
+        if (software_ver) {
+          if (!pxSetRunSoftware(config, "chipRun", "chip_id", chip_id, software_ver)) {
+            psError(PS_ERR_UNKNOWN, false, "failed to set chipRun.software_ver for chip_id: %" PRId64,
+                    chip_id);
+            psFree(output);
+            if (!psDBRollback(config->dbh)) {
+              psError(PS_ERR_UNKNOWN, false, "database error");
+            }
+            return(false);
           }
-          return(false);
         }
         // Set chipRun.maskfrac* to the appropriate values.
-        if (!pxSetRunMaskfrac(config, "chipRun", "chip_id",chip_id, maskfrac_npix, maskfrac_static,
-                              maskfrac_dynamic, maskfrac_magic, maskfrac_advisory)) {
-          psError(PS_ERR_UNKNOWN, false, "failed to set chipRun.software_ver for chip_id: %" PRId64,
-                  chip_id);
-          psFree(output);
-          if (!psDBRollback(config->dbh)) {
-            psError(PS_ERR_UNKNOWN, false, "database error");
+        if (maskfrac_npix) {
+          if (!pxSetRunMaskfrac(config, "chipRun", "chip_id",chip_id, maskfrac_npix, maskfrac_static,
+                                maskfrac_dynamic, maskfrac_magic, maskfrac_advisory)) {
+            psError(PS_ERR_UNKNOWN, false, "failed to set chipRun.software_ver for chip_id: %" PRId64,
+                    chip_id);
+            psFree(output);
+            if (!psDBRollback(config->dbh)) {
+              psError(PS_ERR_UNKNOWN, false, "database error");
+            }
+            return(false);
           }
-          return(false);
         }
         // set chipRun.state to 'stop' and update the magicked state