<!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" />
<title>[3319] CalendarServer/branches/users/cdaboo/implicit-if-match-3306/twistedcaldav</title>
</head>
<body>

<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { 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 #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#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>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.macosforge.org/projects/calendarserver/changeset/3319">3319</a></dd>
<dt>Author</dt> <dd>cdaboo@apple.com</dd>
<dt>Date</dt> <dd>2008-11-04 12:04:07 -0800 (Tue, 04 Nov 2008)</dd>
</dl>

<h3>Log Message</h3>
<pre>Proper Schedule-Tag change logic.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#CalendarServerbranchesuserscdabooimplicitifmatch3306twistedcaldavmethodput_commonpy">CalendarServer/branches/users/cdaboo/implicit-if-match-3306/twistedcaldav/method/put_common.py</a></li>
<li><a href="#CalendarServerbranchesuserscdabooimplicitifmatch3306twistedcaldavschedulingimplicitpy">CalendarServer/branches/users/cdaboo/implicit-if-match-3306/twistedcaldav/scheduling/implicit.py</a></li>
<li><a href="#CalendarServerbranchesuserscdabooimplicitifmatch3306twistedcaldavschedulingprocessingpy">CalendarServer/branches/users/cdaboo/implicit-if-match-3306/twistedcaldav/scheduling/processing.py</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="CalendarServerbranchesuserscdabooimplicitifmatch3306twistedcaldavmethodput_commonpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/cdaboo/implicit-if-match-3306/twistedcaldav/method/put_common.py (3318 => 3319)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/cdaboo/implicit-if-match-3306/twistedcaldav/method/put_common.py        2008-11-04 19:52:26 UTC (rev 3318)
+++ CalendarServer/branches/users/cdaboo/implicit-if-match-3306/twistedcaldav/method/put_common.py        2008-11-04 20:04:07 UTC (rev 3319)
</span><span class="lines">@@ -204,6 +204,7 @@
</span><span class="cx">         isiTIP=False,
</span><span class="cx">         allowImplicitSchedule=True,
</span><span class="cx">         internal_request=False,
</span><ins>+        processing_organizer=None,
</ins><span class="cx">     ):
</span><span class="cx">         &quot;&quot;&quot;
</span><span class="cx">         Function that does common PUT/COPY/MOVE behavior.
</span><span class="lines">@@ -223,6 +224,7 @@
</span><span class="cx">         @param isiTIP:                True if relaxed calendar data validation is to be done, False otherwise.
</span><span class="cx">         @param allowImplicitSchedule: True if implicit scheduling should be attempted, False otherwise.
</span><span class="cx">         @param internal_request:   True if this request originates internally and needs to bypass scheduling authorization checks.
</span><ins>+        @param processing_organizer: True if implicit processing for an organizer, False if for an attendee, None if not implicit processing.
</ins><span class="cx">         &quot;&quot;&quot;
</span><span class="cx">         
</span><span class="cx">         # Check that all arguments are valid
</span><span class="lines">@@ -262,6 +264,7 @@
</span><span class="cx">         self.isiTIP = isiTIP
</span><span class="cx">         self.allowImplicitSchedule = allowImplicitSchedule
</span><span class="cx">         self.internal_request = internal_request
</span><ins>+        self.processing_organizer = processing_organizer
</ins><span class="cx">         
</span><span class="cx">         self.rollback = None
</span><span class="cx">         self.access = None
</span><span class="lines">@@ -901,8 +904,14 @@
</span><span class="cx"> 
</span><span class="cx">                 change_scheduletag = True
</span><span class="cx">                 if self.internal_request:
</span><del>-                    # TODO: Organizer vs Attendee logic
-                    change_scheduletag = False
</del><ins>+                    # Check what kind of processing is going on
+                    if self.processing_organizer == True:
+                        # All auto-processed updates for an Organizer leave the tag unchanged
+                        change_scheduletag = False
+                    elif self.processing_organizer == False:
+                        # Auto-processed updates that are the result of an organizer &quot;refresh' due
+                        # to another Attendee's REPLY should leave the tag unchanged
+                        change_scheduletag = not hasattr(self.request, &quot;doing_attendee_refresh&quot;)
</ins><span class="cx"> 
</span><span class="cx">                 if change_scheduletag or self.scheduletag is None:
</span><span class="cx">                     self.scheduletag = str(uuid.uuid4())
</span></span></pre></div>
<a id="CalendarServerbranchesuserscdabooimplicitifmatch3306twistedcaldavschedulingimplicitpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/cdaboo/implicit-if-match-3306/twistedcaldav/scheduling/implicit.py (3318 => 3319)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/cdaboo/implicit-if-match-3306/twistedcaldav/scheduling/implicit.py        2008-11-04 19:52:26 UTC (rev 3318)
+++ CalendarServer/branches/users/cdaboo/implicit-if-match-3306/twistedcaldav/scheduling/implicit.py        2008-11-04 20:04:07 UTC (rev 3319)
</span><span class="lines">@@ -236,7 +236,11 @@
</span><span class="cx">         self.originatorPrincipal = self.organizerPrincipal
</span><span class="cx">         self.originator = self.organizer
</span><span class="cx">         
</span><del>-        result = (yield self.processRequests())
</del><ins>+        self.request.doing_attendee_refresh = True
+        try:
+            result = (yield self.processRequests())
+        finally:
+            delattr(self.request, &quot;doing_attendee_refresh&quot;)
</ins><span class="cx"> 
</span><span class="cx">         returnValue(result)
</span><span class="cx"> 
</span></span></pre></div>
<a id="CalendarServerbranchesuserscdabooimplicitifmatch3306twistedcaldavschedulingprocessingpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/cdaboo/implicit-if-match-3306/twistedcaldav/scheduling/processing.py (3318 => 3319)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/cdaboo/implicit-if-match-3306/twistedcaldav/scheduling/processing.py        2008-11-04 19:52:26 UTC (rev 3318)
+++ CalendarServer/branches/users/cdaboo/implicit-if-match-3306/twistedcaldav/scheduling/processing.py        2008-11-04 20:04:07 UTC (rev 3319)
</span><span class="lines">@@ -537,6 +537,7 @@
</span><span class="cx">                      isiTIP = False,
</span><span class="cx">                      allowImplicitSchedule = False,
</span><span class="cx">                      internal_request = True,
</span><ins>+                     processing_organizer = self.isOrganizerReceivingMessage(),
</ins><span class="cx">                  ).run()
</span><span class="cx">     
</span><span class="cx">         returnValue(newchild)
</span></span></pre>
</div>
</div>

</body>
</html>