From 26a92b82f8c59ccd23329dd6eedc91b74882062c Mon Sep 17 00:00:00 2001 From: visor Date: Sun, 24 Oct 2010 23:07:48 +0900 Subject: [PATCH] minor fix of date motor function. --- modules/motor-function.cc | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/modules/motor-function.cc b/modules/motor-function.cc index f418124..3086282 100644 --- a/modules/motor-function.cc +++ b/modules/motor-function.cc @@ -168,19 +168,21 @@ void mf_date (const std::vector& args, MlEnv* mlenv) { ustring format; // boost::ptr_vector par; int i; + MNode* v; if (args.size () > 0) { - tm = to_int (mlenv->getVar (args[0])); - for (i = 1; i < args.size (); i ++) { - if (i > 1) - format.append (uColon); - format.append (args[i]); + v = mlenv->getVar (args[0]); + if (! isNil (v)) { + tm = to_int (v); + for (i = 1; i < args.size (); i ++) { + if (i > 1) + format.append (uColon); + format.append (args[i]); + } + if (format.length () == 0) + format = uTimeFormat; + mlenv->env->output->out_toHTML (formatDateString (format, tm)); } - if (format.length () == 0) - format = uTimeFormat; -// datetime_list (par, tm); -// mlenv->env->output->out_toHTML (formatDateString (format, par)); - mlenv->env->output->out_toHTML (formatDateString (format, tm)); } } -- 2.11.0