Changeset 1741 for ZMS

Timestamp:

25.11.2011 21:33:35 (6 months ago)

Author:

zmsdev

Message:

isActive: OverflowError? - mktime argument out of range (requested by uni-bern) (21)

File:

• ZMS/trunk/_objattrs.py (modified) (2 diffs)

ZMS/trunk/_objattrs.py

@@ -21 +21 @@
 from types import StringTypes
 import ZPublisher.HTTPRequest
+import datetime
 import string
 import time
@@ -784 +785 @@
           elif key == 'attr_active_start':
             if value is not None:
-              dt = DateTime(time.mktime(value))
-              b = b and dt.isPast()
+              try:
+                dt = DateTime(time.mktime(value))
+                b = b and dt.isPast()
+              except:
+                # todo: consistent replacement of time by datetime
+                dtValue = datetime.datetime(value[0],value[1],value[2],value[3],value[4],value[5],value[6])
+                b = b and datetime.datetime.now() > dtValue
           # End time.
           elif key == 'attr_active_end':
             if value is not None:
-              dt = DateTime(time.mktime(value))
-              b = b and (dt.isFuture() or (dt.equalTo(dt.earliestTime()) and dt.latestTime().isFuture()))
+              try:
+                dt = DateTime(time.mktime(value))
+                b = b and (dt.isFuture() or (dt.equalTo(dt.earliestTime()) and dt.latestTime().isFuture()))
+              except:
+                # todo: consistent replacement of time by datetime
+                dtValue = datetime.datetime(value[0],value[1],value[2],value[3],value[4],value[5],value[6])
+                b = b and dtValue < datetime.datetime.now()
           if not b: break
       return b