Drop copyright and license notices from source files

[libs/core.git] / source / time / datetime.cpp

diff --git a/source/time/datetime.cpp b/source/time/datetime.cpp
index 23d0f2a5e7e223a3cdae6af23e6da121ab87d167..8feeff2f0d21a798f153607ea3f3d02e93b36fd2 100644 (file)
--- a/source/time/datetime.cpp
+++ b/source/time/datetime.cpp
@@ -1,14 +1,6 @@
-/* $Id$
-
-This file is part of libmspcore     
-Copyright © 2006  Mikko Rasa, Mikkosoft Productions
-Distributed under the LGPL
-*/
-
 #include <cstdlib>
-#include <sstream>
-#include <iomanip>
 #include <stdexcept>
+#include <msp/strings/format.h>
 #include "datetime.h"
 #include "timestamp.h"
 #include "units.h"
@@ -151,7 +143,7 @@ void DateTime::add_days(int days)
 
        new_year += cycles;
 
-       if((year-fudge)%4+cycles>=4)
+       if((year-fudge)%4+cycles>=4 && (new_year%100>=4 || new_year%400<4))
        {
                // We passed a leap year - decrement days
                if(days==0)
@@ -187,7 +179,7 @@ void DateTime::set_timezone(const TimeZone &tz)
 
 void DateTime::convert_timezone(const TimeZone &tz)
 {
-       add_raw((zone.get_offset()-tz.get_offset()).raw());
+       add_raw((tz.get_offset()-zone.get_offset()).raw());
        zone = tz;
 }
 
@@ -255,8 +247,7 @@ TimeStamp DateTime::get_timestamp() const
 
 string DateTime::format(const string &fmt) const
 {
-       ostringstream ss;
-       ss.fill('0');
+       string result;
        for(string::const_iterator i=fmt.begin(); i!=fmt.end(); ++i)
        {
                if(*i=='%')
@@ -265,31 +256,31 @@ string DateTime::format(const string &fmt) const
                        if(i==fmt.end())
                                break;
                        else if(*i=='d')
-                               ss<<setw(2)<<int(mday);
+                               result += Msp::format("%02d", mday);
                        else if(*i=='H')
-                               ss<<setw(2)<<int(hour);
+                               result += Msp::format("%02d", hour);
                        else if(*i=='I')
-                               ss<<setw(2)<<hour%12;
+                               result += Msp::format("%02d", hour%12);
                        else if(*i=='m')
-                               ss<<setw(2)<<int(month);
+                               result += Msp::format("%02d", month);
                        else if(*i=='M')
-                               ss<<setw(2)<<int(minute);
+                               result += Msp::format("%02d", minute);
                        else if(*i=='p')
-                               ss<<((hour>=12) ? "PM" : "AM");
+                               result += ((hour>=12) ? "PM" : "AM");
                        else if(*i=='S')
-                               ss<<setw(2)<<int(second);
+                               result += Msp::format("%02d", second);
                        else if(*i=='y')
-                               ss<<setw(2)<<year%100;
+                               result += Msp::format("%02d", year%100);
                        else if(*i=='Y')
-                               ss<<setw(4)<<internal<<year;
+                               result += Msp::format("%04d", year);
                        else if(*i=='%')
-                               ss<<'%';
+                               result += '%';
                }
                else
-                       ss<<*i;
+                       result += *i;
        }
 
-       return ss.str();
+       return result;
 }
 
 string DateTime::format_rfc3339() const
@@ -297,11 +288,8 @@ string DateTime::format_rfc3339() const
        string result = format("%Y-%m-%dT%H:%M:%S");
        if(const TimeDelta &offs = zone.get_offset())
        {
-               ostringstream ss;
-               ss.fill('0');
                int m = abs(static_cast<int>(offs/Time::min));
-               ss<<(offs<zero ? '+' : '-')<<setw(2)<<m/60<<':'<<setw(2)<<m%60;
-               result += ss.str();
+               result += Msp::format("%c%02d:%02d", (offs<zero ? '-' : '+'), m/60, m%60);
        }
        else
                result += 'Z';