Changeset 10733

Timestamp:

2005-10-19T09:03:34+13:00 (18 years ago)

Author:

mdewsnip

Message:

Improved display of dates so values like "19960000" and "19960100" will be displayed correctly (as "1996" and "January 1996", respectively).

File:

• trunk/gsdl/src/recpt/formattools.cpp (modified) (2 diffs)

trunk/gsdl/src/recpt/formattools.cpp

@@ -188 +188 @@
   if (date.size() < 6) return year;
 
-  text_t month = "_textmonth" + substr (datebegin+4, datebegin+6) + "_";
+  text_t month = substr (datebegin+4, datebegin+6);
   int imonth = month.getint();
-  if (imonth < 0 || imonth > 12) return year;
+  if (imonth <= 0 || imonth > 12) return year;
+  month = "_textmonth" + month + "_";
 
   if (date.size() < 8) return month + " " + year;
@@ -197 +198 @@
   if (day[0] == '0') day = substr (day.begin()+1, day.end());
   int iday = day.getint();
-  if (iday < 0 || iday > 31) return month + " " + year;
+  if (iday <= 0 || iday > 31) return month + " " + year;
     
   return day + " " + month + " " + year;