From ac8b31151b70267cdd1acdb0d8cbf98261960a89 Mon Sep 17 00:00:00 2001
From: Doug Blank <doug.blank@gmail.com>
Date: Tue, 19 Feb 2008 06:00:51 +0000
Subject: [PATCH] Fixes for date math and different calendars

svn: r10060
---
 src/gen/lib/date.py | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/src/gen/lib/date.py b/src/gen/lib/date.py
index 2eb7f6d8a..f59e611f9 100644
--- a/src/gen/lib/date.py
+++ b/src/gen/lib/date.py
@@ -184,12 +184,13 @@ class Date:
             self.sortval  = 0
             self.set_yr_mon_day(*source)
         elif type(source) == str:
+            if (calendar != None or 
+                modifier != None or 
+                quality != None):
+                raise AttributeError("can't set calendar, modifier, or quality with string date")
             import DateHandler
             source = DateHandler.parser.parse(source)
-            if calendar == None:
-                self.calendar = Date.CAL_GREGORIAN
-            else:
-                self.calendar = self.lookup_calendar(calendar)
+            self.calendar = source.calendar
             self.modifier = source.modifier
             self.quality  = source.quality
             self.dateval  = source.dateval
@@ -287,7 +288,10 @@ class Date:
             if d1 < d2:
                 d1, d2 = d2, d1
                 date1, date2 = date2, date1
-            # d1 - d2 (1998, 12, 32) - (1982, 12, 15) = 
+            # d1 - d2 (1998, 12, 32) - (1982, 12, 15)
+            if self.calendar != other.calendar:
+                diff = date1.sortval - date2.sortval
+                return (diff/365, (diff % 365)/30, (diff % 365) % 30)
             # days:
             if d2[2] > d1[2]:
                 # months: