<!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>[9494] CalendarServer/branches/users/gaya/inviteclean/txdav/common/datastore/sql.py</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/9494">9494</a></dd>
<dt>Author</dt> <dd>gaya@apple.com</dd>
<dt>Date</dt> <dd>2012-07-24 19:19:47 -0700 (Tue, 24 Jul 2012)</dd>
</dl>

<h3>Log Message</h3>
<pre>combine asShared() and asInvited()</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#CalendarServerbranchesusersgayainvitecleantxdavcommondatastoresqlpy">CalendarServer/branches/users/gaya/inviteclean/txdav/common/datastore/sql.py</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="CalendarServerbranchesusersgayainvitecleantxdavcommondatastoresqlpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/gaya/inviteclean/txdav/common/datastore/sql.py (9493 => 9494)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/gaya/inviteclean/txdav/common/datastore/sql.py        2012-07-25 00:31:47 UTC (rev 9493)
+++ CalendarServer/branches/users/gaya/inviteclean/txdav/common/datastore/sql.py        2012-07-25 02:19:47 UTC (rev 9494)
</span><span class="lines">@@ -2287,32 +2287,19 @@
</span><span class="cx">                         )
</span><span class="cx">         )
</span><span class="cx"> 
</span><del>-
</del><span class="cx">     @classproperty
</span><span class="cx">     def _sharedFor(cls): #@NoSelf
</span><span class="cx">         bind = cls._bindSchema
</span><span class="cx">         return cls._bindEntriesFor(bind.BIND_STATUS == _BIND_STATUS_ACCEPTED)
</span><span class="cx">     
</span><del>-
</del><span class="cx">     @inlineCallbacks
</span><del>-    def asShared(self):
-        &quot;&quot;&quot;
-        Retrieve all the versions of this L{CommonHomeChild} as it is shared to
-        everyone.
</del><ins>+    def _asBound(self, query):
+        rows = yield query.on(self._txn, 
+                                resourceID=self._resourceID)
</ins><span class="cx"> 
</span><del>-        @see: L{ICalendarHome.asShared}
-
-        @return: L{CommonHomeChild} objects that represent this
-            L{CommonHomeChild} as a child of different L{CommonHome}s
-        @rtype: a L{Deferred} which fires with a L{list} of L{ICalendar}s.
-        &quot;&quot;&quot;
-        rows = yield self._sharedFor.on(self._txn, 
-                                        resourceID=self._resourceID)
-
</del><span class="cx">         cls = self.__class__ # for ease of grepping...
</span><span class="cx">         result = []
</span><span class="cx">         for bindMode, homeResourceID, sharedResourceName, bindStatus, bindMessage, inviteUID in rows:
</span><del>-            assert bindStatus == _BIND_STATUS_ACCEPTED
</del><span class="cx">             # TODO: this could all be issued in parallel; no need to serialize
</span><span class="cx">             # the loop.
</span><span class="cx">             new = cls(
</span><span class="lines">@@ -2325,8 +2312,24 @@
</span><span class="cx">             yield new.initFromStore()
</span><span class="cx">             result.append(new)
</span><span class="cx">         returnValue(result)
</span><ins>+    
</ins><span class="cx"> 
</span><ins>+    @inlineCallbacks
+    def asShared(self):
+        &quot;&quot;&quot;
+        Retrieve all the versions of this L{CommonHomeChild} as it is shared to
+        everyone.
</ins><span class="cx"> 
</span><ins>+        @see: L{ICalendarHome.asShared}
+
+        @return: L{CommonHomeChild} objects that represent this
+            L{CommonHomeChild} as a child of different L{CommonHome}s
+        @rtype: a L{Deferred} which fires with a L{list} of L{ICalendar}s.
+        &quot;&quot;&quot;
+        result = yield self._asBound(self._sharedFor)
+        returnValue(result)
+
+
</ins><span class="cx">     @classproperty
</span><span class="cx">     def _invitedFor(cls): #@NoSelf
</span><span class="cx">         bind = cls._bindSchema
</span><span class="lines">@@ -2344,28 +2347,9 @@
</span><span class="cx">             L{CommonHomeChild} as a child of different L{CommonHome}s
</span><span class="cx">         @rtype: a L{Deferred} which fires with a L{list} of L{ICalendar}s.
</span><span class="cx">         &quot;&quot;&quot;
</span><del>-        rows = yield self._invitedFor.on(
-            self._txn, resourceID=self._resourceID
-        )
-        cls = self.__class__ # for ease of grepping...
-
-        result = []
-        for bindMode, homeResourceID, sharedResourceName, bindStatus, bindMessage, inviteUID in rows:
-            # TODO: this could all be issued in parallel; no need to serialize
-            # the loop.
-            new = cls(
-                home=(yield self._txn.homeWithResourceID(self._home._homeType,
-                                                    homeResourceID)),
-                name=sharedResourceName, resourceID=self._resourceID,
-                owned=False, mode=bindMode, status=bindStatus, 
-                message=bindMessage, inviteUID=inviteUID,
-            )
-            yield new.initFromStore()
-
-            result.append(new)
</del><ins>+        result = yield self._asBound(self._invitedFor)
</ins><span class="cx">         returnValue(result)
</span><span class="cx"> 
</span><del>-
</del><span class="cx">     @classmethod
</span><span class="cx">     @inlineCallbacks
</span><span class="cx">     def loadAllObjects(cls, home, owned):
</span></span></pre>
</div>
</div>

</body>
</html>