Changeset 266 for XMLIO_V2/dev/common/src/xmlio/calendar_util.cpp

Timestamp:

09/06/11 16:45:08 (13 years ago)

Author:

hozdoba

Message:

Corrections après tests sur titane

File:

• XMLIO_V2/dev/common/src/xmlio/calendar_util.cpp (modified) (4 diffs)

XMLIO_V2/dev/common/src/xmlio/calendar_util.cpp

@@ -37 +37 @@
       {
          CDuration dur(ddr);
-         dur.year = -dur.year;  dur.month  = -dur.month ; dur.day    = -dur.day;
-         dur.hour = -dur.hour;  dur.minute = -dur.minute; dur.second = -dur.second;
+         dur.year   = -dur.year;
+         dur.month  = -dur.month;
+         dur.day    = -dur.day;
+         dur.hour   = -dur.hour;
+         dur.minute = -dur.minute;
+         dur.second = -dur.second;
          return (dur);
       }
@@ -68 +72 @@
 
          // Ajustement des mois en fonction des jours.
-         int signVal = drr.day/fabs(drr.day);
+         int signVal = (drr.day != 0) ? drr.day/fabs(drr.day) : 0;
          CDate dtt(dt); dtt.addMonth (signVal);
 
@@ -77 +81 @@
          if (day <  0) { drr.month --; day += c.getMonthLength(dtt); }
          if (day >= c.getMonthLength(dtt)) { drr.month ++; day -= c.getMonthLength(dtt); } // << ProblÚme ici
-         if (day == 0) day = c.getMonthLength(dtt);
-
+         if (day == 0){ day = c.getMonthLength(dtt); drr.month --; }
+         
          drr.resolve(dt.getRelCalendar());
 
          // Ajustement des années en fonction des mois.
          month += dt.getMonth() + drr.month;
-         if (month <  0) { year --; month += c.getYearLength(); }
-         if (month >= c.getYearLength()) { year ++; month -= c.getYearLength(); }
-         if (month == 0) month = c.getYearLength();
+         if (month <  0) { drr.year --; month += c.getYearLength(); }
+         if (month >  c.getYearLength()) { drr.year ++; month -= c.getYearLength(); }
+         if (month == 0){ month = c.getYearLength(); drr.year--; }
 
          year += dt.getYear() + drr.year;
@@ -118 +122 @@
       {
          // TODO :: Vérifier que les deux dates (dt0 et dt1) ont une référence vers le même calendrier.
-         if (dt0.getYear()   < dt1.getYear())   return true; if (dt0.getMonth()  < dt1.getMonth())  return true;
-         if (dt0.getDay()    < dt1.getDay())    return true; if (dt0.getHour()   < dt1.getHour())   return true;
-         if (dt0.getMinute() < dt1.getMinute()) return true; if (dt0.getSecond() < dt1.getSecond()) return true;
+         if   (dt0.getYear()  < dt1.getYear())
+         { 
+            return true;
+         }
+         else if (dt0.getYear() == dt1.getYear())
+         { 
+            if   (dt0.getMonth()  < dt1.getMonth())
+            {
+               return true;
+            }
+            else if (dt0.getMonth() == dt1.getMonth())
+            {
+               if   (dt0.getDay()  < dt1.getDay())
+               {
+                   return true;
+               }
+               else if (dt0.getDay() == dt1.getDay())
+               {
+                  if    (dt0.getHour()  < dt1.getHour())
+                  {
+                     return true;
+                  }
+                  else if (dt0.getHour() == dt1.getHour())
+                  { 
+                     if   (dt0.getMinute()  < dt1.getMinute())
+                     {
+                        return true;
+                     }
+                     else if (dt0.getMinute() == dt1.getMinute())
+                     {
+                        if (dt0.getSecond() < dt1.getSecond())
+                           return true;
+                     }
+                  }
+               }
+            }
+         }
          return false;
       }