TW-1471

- TW-1471 task calc uses output it doesn't understand (thanks to Jens Erat).

ChangeLog

@@ -191,6 +191,7 @@
           Boß).
 - TW-1469 Case-insensitive searching broken on Cygwin (thanks to Richard
           Boß).
+- TW-1471 task calc uses output it doesn't understand (thanks to Jens Erat).
 - Added new holidays.xy-XY.rc definition files
 - Removed deprecated 'echo.command' setting, in favor of the 'header' and
   'affected' verbosity tokens.

src/CLI.cpp

@@ -647,7 +647,7 @@ void CLI::addArg (const std::string& arg)
       isID             (raw) ||     // <id>
       isPattern        (raw) ||     // /<pattern</
       isSubstitution   (raw) ||     // /<from>/<to>/[g]
-      isAttribute      (raw) ||     // <name>[.[~]<modfifier>]:<value>
+      isAttribute      (raw) ||     // <name>[.[~]<modifier>]:<value>
       isOperator       (raw))       // <operator>
   {
     _original_args.push_back (raw);

src/Variant.cpp

@@ -2062,13 +2062,7 @@ void Variant::cast (const enum type new_type)
     case type_date:
       {
         _date = 0;
-        if (dateFormat != "")
-        {
-          Date d (_string, dateFormat);
-          _date = d.toEpoch ();
-        }
-        else
-        {
+
         ISO8601d iso;
         std::string::size_type pos = 0;
         if (iso.parse (_string, pos) &&
@@ -2076,6 +2070,10 @@ void Variant::cast (const enum type new_type)
         {
           _date = (time_t) iso;
         }
+        else if (dateFormat != "")
+        {
+          Date d (_string, dateFormat);
+          _date = d.toEpoch ();
         }
       }
       break;