Changeset 521 for cpp/frams

Timestamp:

06/23/16 00:09:06 (8 years ago)

Author:

Maciej Komosinski

Message:

Extended error messages for invalid genotype format declaration

File:

• cpp/frams/genetics/geno.cpp (modified) (4 diffs)

cpp/frams/genetics/geno.cpp

@@ -34 +34 @@
                 if (genstring.charAt(0) == '/')
                 {
-                        int end;
+                        int end, error_end=-1;
                         switch (genstring.charAt(1))
                         {
                         case '/':
                                 genformat = genstring.charAt(2);
-                                if ((genformat=='\0')||(genformat=='\n'))
+                                if ((genformat=='\0')||isspace(genformat))
                                         genformat=INVALID_FORMAT;
                                 if ((end = genstring.indexOf('\n')) >= 0)
                                 {
+                                        error_end=end;
                                         if (end!=3) genformat=INVALID_FORMAT;
                                         gencopy = genstring.substr(end + 1);
@@ -56 +57 @@
                         case '*':
                                 genformat = genstring.charAt(2);
-                                if ((genformat=='\0')||(genformat=='\n'))
+                                if ((genformat=='\0')||isspace(genformat))
                                         genformat=INVALID_FORMAT;
                                 if ((end = genstring.indexOf("*/")) >= 0)
                                 {
+                                        error_end=end+2;
                                         if (end!=3) genformat=INVALID_FORMAT;
                                         gencopy = genstring.substr(end + 2);
@@ -72 +74 @@
                                 break;
                         }
+                if (genformat==INVALID_FORMAT)
+                        {
+                        SString cut;
+                        if (error_end<0) error_end=genstring.len();
+                        static const int MAX_ERROR=20;
+                        if (error_end>MAX_ERROR)
+                                cut=genstring.substr(0,MAX_ERROR)+"...";
+                        else
+                                cut=genstring.substr(0,error_end);
+                        int lf=cut.indexOf('\n');
+                        if (lf>=0) cut=cut.substr(0,lf);
+                        logPrintf("Geno","init",LOG_ERROR,"Invalid genotype format declaration: '%s'%s",cut.c_str(),genname.len()?SString::sprintf(" in '%s'",genname.c_str()).c_str():"");
+                        }
+
                 }
         }
@@ -274 +290 @@
                 }
         isvalid = 0;
-        logPrintf("Geno", "validate", LOG_WARN, "Wrong configuration? No genotype validators defined for genetic format f%c.", format);
+        logPrintf("Geno", "validate", LOG_WARN, "Wrong configuration? No genotype validators defined for genetic format 'f%c'.", format);
 }