<!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>[249] CalendarServer/trunk/twistedcaldav/static.py</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.macosforge.org/projects/calendarserver/changeset/249">249</a></dd>
<dt>Author</dt> <dd>wsanchez@apple.com</dd>
<dt>Date</dt> <dd>2006-10-04 18:28:33 -0700 (Wed, 04 Oct 2006)</dd>
</dl>
<h3>Log Message</h3>
<pre>Also be persnikety about case variants in CalendarHomeProvisioningFile.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#CalendarServertrunktwistedcaldavstaticpy">CalendarServer/trunk/twistedcaldav/static.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="CalendarServertrunktwistedcaldavstaticpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/twistedcaldav/static.py (248 => 249)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/twistedcaldav/static.py 2006-10-05 01:01:13 UTC (rev 248)
+++ CalendarServer/trunk/twistedcaldav/static.py 2006-10-05 01:28:33 UTC (rev 249)
</span><span class="lines">@@ -599,19 +599,9 @@
</span><span class="cx"> if not child_fp.exists(): child_fp.makedirs()
</span><span class="cx"> self.putChild(name, clazz(child_fp.path))
</span><span class="cx">
</span><del>- def locateChild(self, req, segments):
- """
- This implementation tries fails to find children we don't already know
- about.
- """
- # If getChild() finds a child resource, return it
- child = self.getChild(segments[0])
- if child is not None:
- return (child, segments[1:])
</del><ins>+ def locateChild(self, request, segments):
+ return locateExistingChild(self, request, segments)
</ins><span class="cx">
</span><del>- # Otherwise, there is no child
- return (None, ())
-
</del><span class="cx"> def getChild(self, name):
</span><span class="cx"> # This avoids finding case variants of put children on case-insensitive filesystems.
</span><span class="cx"> if name not in self.putChildren and name.lower() in (x.lower() for x in self.putChildren):
</span><span class="lines">@@ -661,9 +651,16 @@
</span><span class="cx"> """
</span><span class="cx"> return name in self.listChildren()
</span><span class="cx">
</span><ins>+ def locateChild(self, request, segments):
+ return locateExistingChild(self, request, segments)
+
</ins><span class="cx"> def getChild(self, name):
</span><span class="cx"> if name == "": return self
</span><span class="cx">
</span><ins>+ # Avoid case variants when allocating resources
+ if not self.hasChild(name):
+ return None
+
</ins><span class="cx"> child_fp = self.fp.child(name)
</span><span class="cx"> if child_fp.exists():
</span><span class="cx"> assert child_fp.isdir()
</span><span class="lines">@@ -671,9 +668,6 @@
</span><span class="cx"> assert self.exists()
</span><span class="cx"> assert self.isCollection()
</span><span class="cx">
</span><del>- if not self.hasChild(name):
- return None
-
</del><span class="cx"> child_fp.makedirs()
</span><span class="cx">
</span><span class="cx"> return self.calendarHomeClass(child_fp.path)
</span><span class="lines">@@ -946,6 +940,23 @@
</span><span class="cx"> def http_MKCALENDAR (self, request): return responsecode.FORBIDDEN
</span><span class="cx">
</span><span class="cx"> ##
</span><ins>+# Utilities
+##
+
+def locateExistingChild(resource, request, segments):
+ """
+ This C{locateChild()} implementation fails to find children if C{getChild()}
+ doesn't return one.
+ """
+ # If getChild() finds a child resource, return it
+ child = resource.getChild(segments[0])
+ if child is not None:
+ return (child, segments[1:])
+
+ # Otherwise, there is no child
+ return (None, ())
+
+##
</ins><span class="cx"> # Attach methods
</span><span class="cx"> ##
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>