[Zope-Checkins] CVS: Products/DCOracle2/DCOracle2 - DCOracle2.py:1.96

Matthew T. Kromer matt@zope.com
Thu, 24 Oct 2002 11:16:45 -0400


Update of /cvs-repository/Products/DCOracle2/DCOracle2
In directory cvs.zope.org:/tmp/cvs-serv27185/DCOracle2

Modified Files:
	DCOracle2.py 
Log Message:
Make an Oracle date creation routine which will accept input dates that don't
have to be in timestamp form, so that dates don't have to be entered in
string notation (Collector #74).


=== Products/DCOracle2/DCOracle2/DCOracle2.py 1.95 => 1.96 ===
--- Products/DCOracle2/DCOracle2/DCOracle2.py:1.95	Mon Sep  9 09:22:29 2002
+++ Products/DCOracle2/DCOracle2/DCOracle2.py	Thu Oct 24 11:16:44 2002
@@ -1091,7 +1091,7 @@
             # XXX                                                 XXX
             # XXX XXX XXX XXX XXX XXX XXX XXX XXX XXX XXX XXX XXX XXX
 
-            baoa[c].setStatic(1)    # Mark this as a static binding
+            #baoa[c].setStatic(1)    # Mark this as a static binding
 
             # ERROR -- this is too early for a normal binding array bind
             #self._cursor.bindbypos(c + 1, baoa[c])
@@ -1776,24 +1776,24 @@
 
 def Date(year, month, day):
     "Date(year, month, day)"
-    t = time.mktime((year, month, day, 0, 0, 0, 0, 0, -1)) 
-    if time.daylight: t = t - time.altzone
-    else: t = t - time.timezone
-    return dco2.OracleDate(t)
+    #t = time.mktime((year, month, day, 0, 0, 0, 0, 0, -1)) 
+    #i time.daylight: t = t - time.altzone
+    #else: t = t - time.timezone
+    return dco2.OracleDate(year, month, day)
 
 def Time(hour, minute, second):
     "Time(hour, minute, second)"
-    t = time.mktime((0, 0, 0, hour, minute, second, 0, 0, -1)) 
-    if time.daylight: t = t - time.altzone
-    else: t = t - time.timezone
-    return dco2.OracleDate(t)
+    #t = time.mktime((0, 0, 0, hour, minute, second, 0, 0, -1)) 
+    #if time.daylight: t = t - time.altzone
+    #else: t = t - time.timezone
+    return dco2.OracleDate(0, 0, 0, hour, minute, second)
 
 def Timestamp(year, month, day, hour, minute, second):
     "Timestamp(year, month, day, hour, minut, second)"
-    t = time.mktime((year, month, day, hour, minute, second, 0, 0, -1)) 
-    if time.daylight: t = t - time.altzone
-    else: t = t - time.timezone
-    return dco2.OracleDate(t)
+    #t = time.mktime((year, month, day, hour, minute, second, 0, 0, -1)) 
+    #if time.daylight: t = t - time.altzone
+    #else: t = t - time.timezone
+    return dco2.OracleDate(year, month, day, hour, minute, second)
 
 def DateFromTicks(ticks):
     "DateFromTicks(ticks)"