Bug #972, #1018

- Fixed bug that accepted a recurrence duration of '7' as '7secs' instead
  of the intended '7days'.  It is now an error to omit the units.  Thanks to
  Vlad Zhivotnev, Stanley G.
- Modified unit tests to avoid a different error.

src/Duration.cpp

@@ -135,11 +135,16 @@ Duration::Duration (const std::string& input)
 {
   if (digitsOnly (input))
   {
-    _secs = (time_t) strtol (input.c_str (), NULL, 10);
-    _negative = false;
+    time_t value = (time_t) strtol (input.c_str (), NULL, 10);
+    if (value == 0 || value > 60)
+    {
+      _secs = value;
+      _negative = false;
+      return;
+    }
   }
-  else
-    parse (input);
+
+  parse (input);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -362,8 +367,9 @@ bool Duration::valid (const std::string& input)
   n.getUntilEOS (units);
 
   // Non-trivial value with no units means the duration is specified in
-  // seconds, and therefore a time_t.  Consider it valid.
-  if (value != 0.0 &&
+  // seconds, and therefore a time_t.  Consider it valid provided it is >= 60.
+  if (value != 0.0  &&
+      value >= 60.0 &&
       units == "")
     return true;
 
@@ -401,13 +407,13 @@ void Duration::parse (const std::string& input)
     _negative = false;
 
   // If no units are provided, assume seconds.
-  if (n.depleted ())
+  std::string units;
+  if (n.depleted () && value >= 60)
   {
     _secs = (long) value;
     return;
   }
 
-  std::string units;
   n.getUntilEOS (units);
 
   // Auto complete against all supported durations.

src/commands/Command.cpp

@@ -545,10 +545,9 @@ void Command::modify_task (
             long l = (long) strtod (result.c_str (), NULL);
             if (labs (l) < 5 * 365 * 86400)
             {
-              Duration dur (result);
+              Duration dur (value);
               Date now;
               now += l;
-              //now += dur;
               task.set (name, now.toEpochString ());
             }
             else
@@ -562,7 +561,7 @@ void Command::modify_task (
           else if (name == "recur" ||
                    column->type () == "duration")
           {
-            // All values must be eval'd first.
+            // All values must be eval'd first, in this case, just to catch errors.
             A3 value_tokens;
             value_tokens.capture (value);
             value_tokens = value_tokens.postfix (value_tokens.tokenize (value_tokens));
@@ -571,8 +570,11 @@ void Command::modify_task (
             std::string result = e.evalExpression (task);
             context.debug (std::string ("Eval '") + value + "' --> '" + result + "'");
 
-            Duration d (result);
-            task.set (name, result);
+            Duration d (value);
+
+            // Deliberately storing the 'raw' value, which is necessary for
+            // durations like 'weekday'..
+            task.set (name, value);
           }
 
           // Need handling for numeric types, used by UDAs.