<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt;  }
#msg dl a { font-weight: bold}
#msg dl a:link    { color:#fc3; }
#msg dl a:active  { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fc0 solid; padding: 6px; }
#msg ul, pre { overflow: auto; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff  {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<title>[1441] CalendarServer/branches/users/cdaboo/fast-multiget-1425/
 twistedcaldav/index.py</title>
</head>
<body>

<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.macosforge.org/projects/calendarserver/changeset/1441">1441</a></dd>
<dt>Author</dt> <dd>cdaboo@apple.com</dd>
<dt>Date</dt> <dd>2007-04-01 20:34:41 -0700 (Sun, 01 Apr 2007)</dd>
</dl>

<h3>Log Message</h3>
<pre>We need the dates stored in the index to all be relative to utc - even the floating ones, as we
always run a query comparing against a utc formatted datetime.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#CalendarServerbranchesuserscdaboofastmultiget1425twistedcaldavindexpy">CalendarServer/branches/users/cdaboo/fast-multiget-1425/twistedcaldav/index.py</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="CalendarServerbranchesuserscdaboofastmultiget1425twistedcaldavindexpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/cdaboo/fast-multiget-1425/twistedcaldav/index.py (1440 => 1441)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/cdaboo/fast-multiget-1425/twistedcaldav/index.py        2007-04-02 03:32:30 UTC (rev 1440)
+++ CalendarServer/branches/users/cdaboo/fast-multiget-1425/twistedcaldav/index.py        2007-04-02 03:34:41 UTC (rev 1441)
</span><span class="lines">@@ -44,6 +44,8 @@
</span><span class="cx"> from twistedcaldav.query import calendarquery
</span><span class="cx"> from twistedcaldav import caldavxml
</span><span class="cx"> 
</span><ins>+from vobject.icalendar import utc
+
</ins><span class="cx"> db_basename = &quot;.db.sqlite&quot;
</span><span class="cx"> schema_version = &quot;4&quot;
</span><span class="cx"> collection_types = {&quot;Calendar&quot;: &quot;Regular Calendar Collection&quot;, &quot;iTIP&quot;: &quot;iTIP Calendar Collection&quot;}
</span><span class="lines">@@ -548,12 +550,14 @@
</span><span class="cx">         instances = calendar.expandTimeRanges(expand_max)
</span><span class="cx">         for key in instances:
</span><span class="cx">             instance = instances[key]
</span><ins>+            start = instance.start.replace(tzinfo=utc)
+            end = instance.end.replace(tzinfo=utc)
</ins><span class="cx">             float = ('N', 'Y')[instance.start.tzinfo is None]
</span><span class="cx">             self._db_execute(
</span><span class="cx">                 &quot;&quot;&quot;
</span><span class="cx">                 insert into TIMESPAN (NAME, FLOAT, START, END)
</span><span class="cx">                 values (:1, :2, :3, :4)
</span><del>-                &quot;&quot;&quot;, name, float, normalizeForIndex(instance.start), normalizeForIndex(instance.end)
</del><ins>+                &quot;&quot;&quot;, name, float, start, end
</ins><span class="cx">             )
</span><span class="cx"> 
</span><span class="cx">         self._db_execute(
</span></span></pre>
</div>
</div>

</body>
</html>