MARS-962 added support for TypeClimateDaily and TypeClimateMonthly

Author: danovaro

src/metkit/mars/TypeDate.cc

@@ -9,10 +9,10 @@
  */
 
 #include "eckit/utils/Translator.h"
-
+#include "eckit/utils/Tokenizer.h"
 #include "eckit/types/Date.h"
-#include "metkit/mars/MarsRequest.h"
 
+#include "metkit/mars/MarsRequest.h"
 #include "metkit/mars/TypesFactory.h"
 #include "metkit/mars/TypeDate.h"
 #include "eckit/utils/StringTools.h"
@@ -24,6 +24,24 @@ namespace metkit::mars {
 
 //----------------------------------------------------------------------------------------------------------------------
 
+static const char* months[] = {
+    "jan", "feb", "mar", "apr", "may", "jun", "jul", "aug", "sep", "oct", "nov", "dec",
+};
+
+int month(const std::string& value) {
+    if (value.size() == 3) {
+        std::string month = eckit::StringTools::lower(value).substr(0,3);
+        for (size_t i=0; i<12; i++) { // check month name
+            if (months[i] == month) {
+                return i+1;
+            }
+        }
+    }
+
+    eckit::Translator<std::string, int> s2i;
+    return s2i(value);
+}
+
 TypeDate::TypeDate(const std::string &name, const eckit::Value& settings) :
     Type(name, settings), TypeToByList<eckit::Date, long>(name, settings) {
 
@@ -42,18 +60,35 @@ void TypeDate::pass2(const MarsExpandContext& ctx, MarsRequest& request) {
 
 bool TypeDate::expand(const MarsExpandContext& ctx, std::string &value) const {
     if (!value.empty()) {
+        eckit::Translator<std::string, long> s2l;
         eckit::Translator<long, std::string> l2s;
         if (value[0] == '0' || value[0] == '-') {
-            eckit::Translator<std::string, long> s2l;
             long n = s2l(value);
             if (n <= 0) {
                 eckit::Date now(n);
                 value = l2s(now.yyyymmdd());
             }
         }
         else {
-            eckit::Date date(value);
-            value = l2s(date.yyyymmdd());
+            eckit::Tokenizer t("-");
+            std::vector<std::string> tokens = t.tokenize(value);
+
+            if (tokens.size() == 2) { // TypeClimateDaily
+                int m = month(tokens[0]);
+                long d = s2l(tokens[1]);
+                
+                value = l2s(100*m + d);
+            }
+            else {
+                if (tokens[0].size() <= 3) {
+                    int m = month(tokens[0]);
+                    value = l2s(m);
+                }
+                else {
+                    eckit::Date date(value);
+                    value = l2s(date.yyyymmdd());        
+                }
+            }
         }
     }
     return true;