Changeset 28017 for branches/czw_branch/20100427/ippTools/src/stacktool.c

Timestamp:

May 18, 2010, 5:06:01 PM (16 years ago)

Author:

watersc1

Message:

Almost working version of the mask-stats/software revision code.

Almost.

Location:

branches/czw_branch/20100427

Files:

• . (modified) (1 prop)
• ippTools/src/stacktool.c (modified) (5 diffs)

branches/czw_branch/20100427/ippTools/src/stacktool.c

@@ -370 +370 @@
             tess_id,
             filter,
+            NULL, // software_ver
             note);
 
@@ -526 +527 @@
         tess_id,
         filter,
+        NULL, // software_ver
         note);
 
@@ -853 +855 @@
     psTrace("czw.test",1,"Received versions: pslib %s psmodules %s psphot %s ppstats %s ppstack %s streaks %s\n",
             ver_pslib,ver_psmodules,ver_psphot,ver_ppstats,ver_ppstack,ver_streaks);
+    psString software_ver = NULL;
+    if ((ver_pslib)&&(ver_psmodules)) {
+      software_ver = pxMergeCodeVersions(ver_pslib,ver_psmodules);
+    }
+    if (ver_psphot) {
+      software_ver = pxMergeCodeVersions(software_ver,ver_psphot);
+    }
+    if (ver_ppstats) {
+      software_ver = pxMergeCodeVersions(software_ver,ver_ppstats);
+    }
+    if (ver_ppstack) {
+      software_ver = pxMergeCodeVersions(software_ver,ver_ppstack);
+    }
+    if (ver_streaks) {
+      software_ver = pxMergeCodeVersions(software_ver,ver_streaks);
+    }
     
     // default values
@@ -893 +911 @@
                                good_frac,
                                fault,
+                               software_ver,
                                quality
-/*                             quality, */
-/*                             ver_pslib, */
-/*                             ver_psmodules, */
-/*                             ver_psphot, */
-/*                             ver_ppstats, */
-/*                             ver_ppstack, */
-/*                             ver_streaks */
           )) {
         if (!psDBRollback(config->dbh)) {
@@ -910 +922 @@
 
     if (fault == 0) {
+        // Set stackRun software if we are finished.
+        if (!pxSetRunSoftware(config, "stackRun", "stack_id", stack_id, software_ver)) {
+          if (!psDBRollback(config->dbh)) {
+            psError(PS_ERR_UNKNOWN, false, "database error");
+          }
+          psError(PS_ERR_UNKNOWN, false, "failed to set stackRun.software_ver for stack_id: %" PRId64,
+                  stack_id);
+          return(false);
+        }
+
         if (!setstackRunState(config, stack_id, "full")) {
             if (!psDBRollback(config->dbh)) {