Changeset 393 for cpp/frams/param/param.cpp

Timestamp:

06/03/15 17:57:46 (9 years ago)

Author:

sz

Message:

f0 parsing corrections and enhancements:

• f0 genotype becomes invalid if any of its numeric fields can't be parsed
• ParamInterface::set and ParamInterface::load2 return the error flag if a numeric parsing error occured
• fixed a bug in load2 (was failing on quoted fields containing a comma)

File:

• cpp/frams/param/param.cpp (modified) (6 diffs)

cpp/frams/param/param.cpp

@@ -529 +529 @@
                 paInt mn, mx, def;
                 if (getMinMax(i, mn, mx, def) >= 3)
-                        return setInt(i, def);
+                        return setInt(i, def) | PSET_PARSEFAILED;
                 else
-                        return setInt(i, (paInt)0);
+                        return setInt(i, (paInt)0) | PSET_PARSEFAILED;
         }
         else
@@ -544 +544 @@
                 double mn, mx, def;
                 if (getMinMax(i, mn, mx, def) >= 3)
-                        return setDouble(i, def);
+                        return setDouble(i, def) | PSET_PARSEFAILED;
                 else
-                        return setDouble(i, (double)0);
+                        return setDouble(i, (double)0) | PSET_PARSEFAILED;
         }
         else
@@ -1013 +1013 @@
         const char *value, *valstop;
         SString tmpvalue;
+        bool parse_failed=false;
         if (poz >= s.len()) return fields_loaded;
         t = s.c_str() + poz;
@@ -1038 +1039 @@
                         {
                                 field_end = strchrlimit(quote2 + 1, ',', end);
-                                if (!field_end) next_field = field_end = end;
+                                if (!field_end) field_end = end;
+                                next_field = field_end;
                         }
                         equals_sign = strchrlimit(t, '=', quote);
@@ -1094 +1096 @@
                                 logPrintf("Param", "load2", LOG_WARN, "Adjusted '%s' in '%s' (was too %s)",
                                 id(i), getName(), (ret&PSET_HITMAX) ? "big" : "small");
+                        if (ret&PSET_PARSEFAILED)
+                                parse_failed=true;
                         *(char*)valstop = remember;
                 }
@@ -1104 +1108 @@
 #endif
         }
-        return fields_loaded;
+        return fields_loaded | (parse_failed ? LOAD2_PARSE_FAILED : 0);
 }