Changeset a3a29a6 in tol

Timestamp:

Feb 26, 2010, 12:00:47 PM (17 years ago)

Author:

Víctor de Buen <vdebuen@…>

Branches:

1941-docker-image-to-test, devel, master

Children:

0e3f1271

Parents:

c9c91f7

Message:

Ensuring GetOperator returns no null

git-svn-id: ​https://www.tol-project.org/svn/tolp/trunk@2037 be4846ae-f051-483a-831f-b64e7d08527f

File:

• tol/btol/set_type/setgrainc.cpp (modified) (2 diffs)

tol/btol/set_type/setgrainc.cpp

@@ -1659 +1659 @@
             {
               BText expr = Compact(ftxt);
-              BDate dte = ConstantDate(expr);
+              BDate dte;
+              if((expr=="") | (expr=="?") | (expr=="Unknown") | (expr=="UnknownDate"))
+              {
+                ok = true; 
+              }
+              else
+              { 
+                dte = ConstantDate(expr);
+                ok = (dte.HasValue()!=0);
+              }
               fieldValue = new BContensDate("",dte,"");
-              ok = dte.HasValue() | (expr=="?") | (expr=="UnknownDate");
             }
             else if(gra==GraReal())
@@ -1667 +1675 @@
               char * pEnd;
               BText expr = Compact(ftxt);
-              double x = strtod(expr.String(),&pEnd);
-              if(!pEnd || pEnd[0]) { x = BDat::Nan(); }
+              double x = BDat::Nan();
+              if((expr=="") | (expr=="?"))
+              {
+                ok = true; 
+              }
+              else
+              { 
+                x = strtod(expr.String(),&pEnd);
+                if(!pEnd || pEnd[0]) { x = BDat::Nan(); }
+                ok = !IS_NAN(x);
+              }
               fieldValue = new BContensDat("",x,"");
-              ok = !IS_NAN(x) | (expr=="?");
             }
             if(!fieldValue)