Changeset 31430 for branches/czw_branch/20110406/ippTools/src/laptool.c

Timestamp:

May 4, 2011, 2:20:59 PM (15 years ago)

Author:

watersc1

Message:

Fixed segfault in laptool -updaterun (expected state to always be defined, but that's not true). Final touches on lap_science.pl to have consistent counts and error messages.

File:

• branches/czw_branch/20110406/ippTools/src/laptool.c (modified) (1 diff)

branches/czw_branch/20110406/ippTools/src/laptool.c

@@ -460 +460 @@
   if (rows) {
     // We're done with these exposures now, so mark them as inactive.
-    if ((strcmp(state,"drop") == 0)||
-        (strcmp(state,"full") == 0)) {
-      values = psMetadataAlloc();
-      psMetadataAddBool(values, PS_LIST_TAIL, "active", 0, "", false);
-      long exps = psDBUpdateRows(config->dbh, "lapExp", where, values);
-
-      if (exps) {
-        return(true);
-      }
-      else {
-        return(true); // We shouldn't really fail if we didn't change anything. Maybe there's nothing to change.
+    if (state) {
+      if ((strcmp(state,"drop") == 0)||
+          (strcmp(state,"full") == 0)) {
+        values = psMetadataAlloc();
+        psMetadataAddBool(values, PS_LIST_TAIL, "active", 0, "", false);
+        long exps = psDBUpdateRows(config->dbh, "lapExp", where, values);
+        
+        if (exps) {
+          return(true);
+        }
+        else {
+          return(true); // We shouldn't really fail if we didn't change anything. Maybe there's nothing to change.
+        }
       }
     }