<!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>[12983] CalendarServer/branches/users/sagen/move2who-4</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.calendarserver.org//changeset/12983">12983</a></dd>
<dt>Author</dt> <dd>sagen@apple.com</dd>
<dt>Date</dt> <dd>2014-03-20 18:02:47 -0700 (Thu, 20 Mar 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>csmp supports structured location info</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#CalendarServerbranchesuserssagenmove2who4calendarservertoolsprincipalspy">CalendarServer/branches/users/sagen/move2who-4/calendarserver/tools/principals.py</a></li>
<li><a href="#CalendarServerbranchesuserssagenmove2who4txdavdpsclientpy">CalendarServer/branches/users/sagen/move2who-4/txdav/dps/client.py</a></li>
<li><a href="#CalendarServerbranchesuserssagenmove2who4txdavwhoaugmentpy">CalendarServer/branches/users/sagen/move2who-4/txdav/who/augment.py</a></li>
<li><a href="#CalendarServerbranchesuserssagenmove2who4txdavwhodirectorypy">CalendarServer/branches/users/sagen/move2who-4/txdav/who/directory.py</a></li>
<li><a href="#CalendarServerbranchesuserssagenmove2who4txdavwhoidirectorypy">CalendarServer/branches/users/sagen/move2who-4/txdav/who/idirectory.py</a></li>
<li><a href="#CalendarServerbranchesuserssagenmove2who4txdavwhoutilpy">CalendarServer/branches/users/sagen/move2who-4/txdav/who/util.py</a></li>
<li><a href="#CalendarServerbranchesuserssagenmove2who4txdavwhoxmlpy">CalendarServer/branches/users/sagen/move2who-4/txdav/who/xml.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="CalendarServerbranchesuserssagenmove2who4calendarservertoolsprincipalspy"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/sagen/move2who-4/calendarserver/tools/principals.py (12982 => 12983)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/sagen/move2who-4/calendarserver/tools/principals.py 2014-03-20 03:28:55 UTC (rev 12982)
+++ CalendarServer/branches/users/sagen/move2who-4/calendarserver/tools/principals.py 2014-03-21 01:02:47 UTC (rev 12983)
</span><span class="lines">@@ -258,23 +258,23 @@
</span><span class="cx"> elif opt in ("", "--get-auto-accept-group"):
</span><span class="cx"> principalActions.append((action_getAutoAcceptGroup,))
</span><span class="cx">
</span><del>- # elif opt in ("", "--set-geo"):
- # principalActions.append((action_setValue, "Geo", arg))
</del><ins>+ elif opt in ("", "--set-geo"):
+ principalActions.append((action_setValue, u"geographicLocation", arg))
</ins><span class="cx">
</span><del>- # elif opt in ("", "--get-geo"):
- # principalActions.append((action_getValue, "Geo"))
</del><ins>+ elif opt in ("", "--get-geo"):
+ principalActions.append((action_getValue, u"geographicLocation"))
</ins><span class="cx">
</span><del>- # elif opt in ("", "--set-street-address"):
- # principalActions.append((action_setValue, "StreetAddress", arg))
</del><ins>+ elif opt in ("", "--set-street-address"):
+ principalActions.append((action_setValue, u"streetAddress", arg))
</ins><span class="cx">
</span><del>- # elif opt in ("", "--get-street-address"):
- # principalActions.append((action_getValue, "StreetAddress"))
</del><ins>+ elif opt in ("", "--get-street-address"):
+ principalActions.append((action_getValue, u"streetAddress"))
</ins><span class="cx">
</span><del>- # elif opt in ("", "--set-address"):
- # principalActions.append((action_setValue, "AssociatedAddress", arg))
</del><ins>+ elif opt in ("", "--set-address"):
+ principalActions.append((action_setValue, u"associatedAddress", arg))
</ins><span class="cx">
</span><del>- # elif opt in ("", "--get-address"):
- # principalActions.append((action_getValue, "AssociatedAddress"))
</del><ins>+ elif opt in ("", "--get-address"):
+ principalActions.append((action_getValue, u"associatedAddress"))
</ins><span class="cx">
</span><span class="cx"> else:
</span><span class="cx"> raise NotImplementedError(opt)
</span><span class="lines">@@ -732,6 +732,39 @@
</span><span class="cx"> )
</span><span class="cx">
</span><span class="cx">
</span><ins>+@inlineCallbacks
+def action_setValue(store, record, name, value):
+ print(
+ "Setting {name} to {value} for {record}".format(
+ name=name, value=value, record=prettyRecord(record),
+ )
+ )
+ # Get original fields
+ newFields = record.fields.copy()
+
+ # Set new value
+ newFields[record.service.fieldName.lookupByName(name)] = value
+
+ updatedRecord = DirectoryRecord(record.service, newFields)
+ yield record.service.updateRecords([updatedRecord], create=False)
+
+
+def action_getValue(store, record, name):
+ try:
+ value = record.fields[record.service.fieldName.lookupByName(name)]
+ print(
+ "{name} for {record} is {value}".format(
+ name=name, record=prettyRecord(record), value=value
+ )
+ )
+ except KeyError:
+ print(
+ "{name} is not set for {record}".format(
+ name=name, record=prettyRecord(record),
+ )
+ )
+
+
</ins><span class="cx"> def abort(msg, status=1):
</span><span class="cx"> sys.stdout.write("%s\n" % (msg,))
</span><span class="cx"> try:
</span></span></pre></div>
<a id="CalendarServerbranchesuserssagenmove2who4txdavdpsclientpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/sagen/move2who-4/txdav/dps/client.py (12982 => 12983)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/sagen/move2who-4/txdav/dps/client.py 2014-03-20 03:28:55 UTC (rev 12982)
+++ CalendarServer/branches/users/sagen/move2who-4/txdav/dps/client.py 2014-03-21 01:02:47 UTC (rev 12983)
</span><span class="lines">@@ -41,6 +41,7 @@
</span><span class="cx"> from txdav.who.directory import (
</span><span class="cx"> CalendarDirectoryRecordMixin, CalendarDirectoryServiceMixin
</span><span class="cx"> )
</span><ins>+import txdav.who.augment
</ins><span class="cx"> import txdav.who.delegates
</span><span class="cx"> import txdav.who.idirectory
</span><span class="cx"> from zope.interface import implementer
</span><span class="lines">@@ -79,7 +80,8 @@
</span><span class="cx">
</span><span class="cx"> fieldName = ConstantsContainer(
</span><span class="cx"> (twext.who.idirectory.FieldName,
</span><del>- txdav.who.idirectory.FieldName)
</del><ins>+ txdav.who.idirectory.FieldName,
+ txdav.who.augment.FieldName)
</ins><span class="cx"> )
</span><span class="cx">
</span><span class="cx">
</span></span></pre></div>
<a id="CalendarServerbranchesuserssagenmove2who4txdavwhoaugmentpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/sagen/move2who-4/txdav/who/augment.py (12982 => 12983)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/sagen/move2who-4/txdav/who/augment.py 2014-03-20 03:28:55 UTC (rev 12982)
+++ CalendarServer/branches/users/sagen/move2who-4/txdav/who/augment.py 2014-03-21 01:02:47 UTC (rev 12983)
</span><span class="lines">@@ -26,19 +26,22 @@
</span><span class="cx"> from zope.interface import implementer
</span><span class="cx">
</span><span class="cx"> from twisted.internet.defer import inlineCallbacks, returnValue
</span><del>-
</del><span class="cx"> from twistedcaldav.directory.augment import AugmentRecord
</span><span class="cx"> from twext.python.log import Logger
</span><span class="cx"> from twext.who.directory import DirectoryRecord
</span><span class="cx"> from twext.who.directory import DirectoryService as BaseDirectoryService
</span><del>-from twext.who.idirectory import IDirectoryService, RecordType
</del><ins>+from twext.who.idirectory import (
+ IDirectoryService, RecordType, FieldName as BaseFieldName
+)
</ins><span class="cx"> from twext.who.util import ConstantsContainer
</span><span class="cx">
</span><span class="cx"> from txdav.common.idirectoryservice import IStoreDirectoryService
</span><span class="cx"> from txdav.who.directory import (
</span><del>- CalendarDirectoryRecordMixin, CalendarDirectoryServiceMixin
</del><ins>+ CalendarDirectoryRecordMixin, CalendarDirectoryServiceMixin,
</ins><span class="cx"> )
</span><del>-from txdav.who.idirectory import AutoScheduleMode, FieldName
</del><ins>+from txdav.who.idirectory import (
+ AutoScheduleMode, FieldName
+)
</ins><span class="cx">
</span><span class="cx"> log = Logger()
</span><span class="cx">
</span><span class="lines">@@ -56,7 +59,7 @@
</span><span class="cx"> """
</span><span class="cx">
</span><span class="cx"> fieldName = ConstantsContainer((
</span><del>- BaseDirectoryService.fieldName,
</del><ins>+ BaseFieldName,
</ins><span class="cx"> FieldName,
</span><span class="cx"> ))
</span><span class="cx">
</span></span></pre></div>
<a id="CalendarServerbranchesuserssagenmove2who4txdavwhodirectorypy"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/sagen/move2who-4/txdav/who/directory.py (12982 => 12983)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/sagen/move2who-4/txdav/who/directory.py 2014-03-20 03:28:55 UTC (rev 12982)
+++ CalendarServer/branches/users/sagen/move2who-4/txdav/who/directory.py 2014-03-21 01:02:47 UTC (rev 12983)
</span><span class="lines">@@ -181,9 +181,10 @@
</span><span class="cx"> "writeDelegatorGroup": "writeDelegatorGroups",
</span><span class="cx"> }
</span><span class="cx">
</span><del>- # FIXME: Existing code assumes record type names are plural. Is there any
- # reason to maintain backwards compatibility? I suppose there could be
- # scripts referring to record type of "users", "locations"
</del><ins>+
+ # Maps record types <--> url path segments, i.e. the segment after
+ # /principals/ e.g. "users" or "groups"
+
</ins><span class="cx"> def recordTypeToOldName(self, recordType):
</span><span class="cx"> return self._oldRecordTypeNames[recordType.name]
</span><span class="cx">
</span><span class="lines">@@ -201,9 +202,6 @@
</span><span class="cx"> @inlineCallbacks
</span><span class="cx"> def verifyCredentials(self, credentials):
</span><span class="cx">
</span><del>- # XYZZY REMOVE THIS, it bypasses all authentication!:
- # returnValue(True)
-
</del><span class="cx"> if isinstance(credentials, UsernamePassword):
</span><span class="cx"> log.debug("UsernamePassword")
</span><span class="cx"> returnValue(
</span></span></pre></div>
<a id="CalendarServerbranchesuserssagenmove2who4txdavwhoidirectorypy"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/sagen/move2who-4/txdav/who/idirectory.py (12982 => 12983)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/sagen/move2who-4/txdav/who/idirectory.py 2014-03-20 03:28:55 UTC (rev 12982)
+++ CalendarServer/branches/users/sagen/move2who-4/txdav/who/idirectory.py 2014-03-21 01:02:47 UTC (rev 12983)
</span><span class="lines">@@ -155,3 +155,26 @@
</span><span class="cx"> autoAcceptGroup = NamedConstant()
</span><span class="cx"> autoAcceptGroup.description = u"auto-accept group"
</span><span class="cx"> autoAcceptGroup.valueType = BaseFieldName.valueType(BaseFieldName.uid)
</span><ins>+
+ # For "locations", i.e., scheduled spaces:
+
+ associatedAddress = NamedConstant()
+ associatedAddress.description = u"associated address UID"
+
+ capacity = NamedConstant()
+ capacity.description = u"room capacity"
+ capacity.valueType = int
+
+ floor = NamedConstant()
+ floor.description = u"building floor"
+
+ # For "addresses", i.e., non-scheduled areas containing locations:
+
+ abbreviatedName = NamedConstant()
+ abbreviatedName.description = u"abbreviated name"
+
+ geographicLocation = NamedConstant()
+ geographicLocation.description = u"geographic location URI"
+
+ streetAddress = NamedConstant()
+ streetAddress.description = u"street address"
</ins></span></pre></div>
<a id="CalendarServerbranchesuserssagenmove2who4txdavwhoutilpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/sagen/move2who-4/txdav/who/util.py (12982 => 12983)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/sagen/move2who-4/txdav/who/util.py 2014-03-20 03:28:55 UTC (rev 12982)
+++ CalendarServer/branches/users/sagen/move2who-4/txdav/who/util.py 2014-03-21 01:02:47 UTC (rev 12983)
</span><span class="lines">@@ -22,16 +22,22 @@
</span><span class="cx"> from txdav.who.augment import AugmentedDirectoryService
</span><span class="cx">
</span><span class="cx"> from calendarserver.tap.util import getDBPool, storeFromConfig
</span><del>-from twext.who.idirectory import RecordType, DirectoryConfigurationError
</del><ins>+from twext.who.idirectory import (
+ RecordType, DirectoryConfigurationError, FieldName
+)
</ins><span class="cx"> from twext.who.ldap import DirectoryService as LDAPDirectoryService
</span><span class="cx"> from twext.who.util import ConstantsContainer
</span><span class="cx"> from twisted.python.filepath import FilePath
</span><span class="cx"> from twisted.python.reflect import namedClass
</span><span class="cx"> from twistedcaldav.config import fullServerPath
</span><span class="cx"> from txdav.who.delegates import DirectoryService as DelegateDirectoryService
</span><del>-from txdav.who.idirectory import RecordType as CalRecordType
</del><ins>+from txdav.who.idirectory import (
+ RecordType as CalRecordType,
+ FieldName as CalFieldName
+)
</ins><span class="cx"> from txdav.who.xml import DirectoryService as XMLDirectoryService
</span><span class="cx">
</span><ins>+
</ins><span class="cx"> log = Logger()
</span><span class="cx">
</span><span class="cx">
</span><span class="lines">@@ -61,6 +67,9 @@
</span><span class="cx"> directoryType = serviceValue.type.lower()
</span><span class="cx"> params = serviceValue.params
</span><span class="cx">
</span><ins>+ # TODO: add a "test" directory service that produces test records
+ # from code -- no files needed.
+
</ins><span class="cx"> if "xml" in directoryType:
</span><span class="cx"> xmlFile = params.xmlFile
</span><span class="cx"> xmlFile = fullServerPath(config.DataRoot, xmlFile)
</span><span class="lines">@@ -115,6 +124,7 @@
</span><span class="cx"> types.append(recordType)
</span><span class="cx">
</span><span class="cx"> directory.recordType = ConstantsContainer(types)
</span><ins>+ directory.fieldName = ConstantsContainer((FieldName, CalFieldName))
</ins><span class="cx"> aggregatedServices.append(directory)
</span><span class="cx">
</span><span class="cx"> #
</span></span></pre></div>
<a id="CalendarServerbranchesuserssagenmove2who4txdavwhoxmlpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/sagen/move2who-4/txdav/who/xml.py (12982 => 12983)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/sagen/move2who-4/txdav/who/xml.py 2014-03-20 03:28:55 UTC (rev 12982)
+++ CalendarServer/branches/users/sagen/move2who-4/txdav/who/xml.py 2014-03-21 01:02:47 UTC (rev 12983)
</span><span class="lines">@@ -105,8 +105,30 @@
</span><span class="cx"> AutoScheduleMode.acceptIfFreeDeclineIfBusy
</span><span class="cx"> )
</span><span class="cx">
</span><ins>+ # For "locations", i.e., scheduled spaces:
</ins><span class="cx">
</span><ins>+ capacity = ValueConstant(u"capacity")
+ capacity.fieldName = FieldName.capacity
</ins><span class="cx">
</span><ins>+ floor = ValueConstant(u"floor")
+ floor.fieldName = FieldName.floor
+
+ associatedAddress = ValueConstant(u"associatedAddress")
+ associatedAddress.fieldName = FieldName.associatedAddress
+
+ # For "addresses", i.e., non-scheduled areas containing locations:
+
+ abbreviatedName = ValueConstant(u"abbreviatedName")
+ abbreviatedName.fieldName = FieldName.abbreviatedName
+
+ streetAddress = ValueConstant(u"streetAddress")
+ streetAddress.fieldName = FieldName.streetAddress
+
+ geographicLocation = ValueConstant(u"geographicLocation")
+ geographicLocation.fieldName = FieldName.geographicLocation
+
+
+
</ins><span class="cx"> class Attribute(Values):
</span><span class="cx"> """
</span><span class="cx"> XML calendar and contacts attribute names.
</span></span></pre>
</div>
</div>
</body>
</html>