<!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>[12408] twext/trunk/twext/who/ldap/_service.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.calendarserver.org//changeset/12408">12408</a></dd>
<dt>Author</dt> <dd>wsanchez@apple.com</dd>
<dt>Date</dt> <dd>2014-01-20 15:00:22 -0800 (Mon, 20 Jan 2014)</dd>
</dl>

<h3>Log Message</h3>
<pre>Get rif of uidField argument.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#twexttrunktwextwholdap_servicepy">twext/trunk/twext/who/ldap/_service.py</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="twexttrunktwextwholdap_servicepy"></a>
<div class="modfile"><h4>Modified: twext/trunk/twext/who/ldap/_service.py (12407 => 12408)</h4>
<pre class="diff"><span>
<span class="info">--- twext/trunk/twext/who/ldap/_service.py        2014-01-20 22:48:21 UTC (rev 12407)
+++ twext/trunk/twext/who/ldap/_service.py        2014-01-20 23:00:22 UTC (rev 12408)
</span><span class="lines">@@ -140,6 +140,7 @@
</span><span class="cx"> # Maps field name -&gt; LDAP attribute names
</span><span class="cx"> DEFAULT_FIELDNAME_ATTRIBUTE_MAP = MappingProxyType({
</span><span class="cx">     FieldName.dn: (LDAPAttribute.dn.value,),
</span><ins>+    BaseFieldName.uid: (LDAPAttribute.generatedUUID.value,),
</ins><span class="cx">     BaseFieldName.guid: (LDAPAttribute.generatedUUID.value,),
</span><span class="cx">     BaseFieldName.shortNames: (LDAPAttribute.uid.value,),
</span><span class="cx">     BaseFieldName.fullNames: (LDAPAttribute.cn.value,),
</span><span class="lines">@@ -209,7 +210,6 @@
</span><span class="cx">         useTLS=False,
</span><span class="cx">         fieldNameToAttributesMap=DEFAULT_FIELDNAME_ATTRIBUTE_MAP,
</span><span class="cx">         recordTypeSchemas=DEFAULT_RECORDTYPE_SCHEMAS,
</span><del>-        uidField=BaseFieldName.uid,
</del><span class="cx">         _debug=False,
</span><span class="cx">     ):
</span><span class="cx">         &quot;&quot;&quot;
</span><span class="lines">@@ -272,10 +272,9 @@
</span><span class="cx"> 
</span><span class="cx">         self._fieldNameToAttributesMap = fieldNameToAttributesMap
</span><span class="cx">         self._attributeToFieldNameMap = reverseDict(
</span><del>-            &quot;Field name&quot;, fieldNameToAttributesMap
</del><ins>+            fieldNameToAttributesMap
</ins><span class="cx">         )
</span><span class="cx">         self._recordTypeSchemas = recordTypeSchemas
</span><del>-        self._uidField = uidField
</del><span class="cx"> 
</span><span class="cx"> 
</span><span class="cx">     @property
</span><span class="lines">@@ -366,30 +365,19 @@
</span><span class="cx"> 
</span><span class="cx">         records = []
</span><span class="cx"> 
</span><del>-        # self._uidField is the name of the field in
-        # self._fieldNameToAttributesMap that tells us which LDAP attribute
-        # we are using to determine the UID of the record.
-
-        uidAttribute = self._fieldNameToAttributesMap[self._uidField][0]
-
-        # recordTypeAttributes = set(chain(*[
-        #     info[u&quot;attributes&quot;].iterkeys()
-        #     for info in self._recordTypeInfo.itervalues()
-        # ]))
-
</del><span class="cx">         for dn, recordData in reply:
</span><span class="cx"> 
</span><del>-            # Fetch the UID
</del><ins>+            # # Fetch the UID
</ins><span class="cx"> 
</span><del>-            try:
-                uid = recordData[uidAttribute]
-            except KeyError:
-                self.log.debug(
-                    &quot;Ignoring LDAP record data; no UID attribute &quot;
-                    &quot;({log_source._uidField}): {recordData!r}&quot;,
-                    recordData=recordData
-                )
-                continue
</del><ins>+            # try:
+            #     uid = recordData[uidAttribute]
+            # except KeyError:
+            #     self.log.debug(
+            #         &quot;Ignoring LDAP record data; no UID attribute &quot;
+            #         &quot;({log_source._uidField}): {recordData!r}&quot;,
+            #         recordData=recordData
+            #     )
+            #     continue
</ins><span class="cx"> 
</span><span class="cx">             # Determine the record type
</span><span class="cx"> 
</span><span class="lines">@@ -410,30 +398,33 @@
</span><span class="cx">             fields = {}
</span><span class="cx"> 
</span><span class="cx">             for attribute, value in recordData.iteritems():
</span><del>-                fieldName = self._attributeToFieldNameMap.get(attribute, None)
-                if fieldName is None:
</del><ins>+                fieldNames = self._attributeToFieldNameMap.get(attribute)
+
+                if fieldNames is None:
</ins><span class="cx">                     self.log.debug(
</span><span class="cx">                         &quot;Unmapped LDAP attribute {attribute!r} in record &quot;
</span><span class="cx">                         &quot;data: {recordData!r}&quot;,
</span><span class="cx">                         attribute=attribute, recordData=recordData,
</span><span class="cx">                     )
</span><ins>+                    continue
</ins><span class="cx"> 
</span><del>-                valueType = self.fieldName.valueType(fieldName)
</del><ins>+                for fieldName in fieldNames:
+                    valueType = self.fieldName.valueType(fieldName)
</ins><span class="cx"> 
</span><del>-                if valueType in (unicode, UUID):
-                    fields[fieldName] = valueType(value)
</del><ins>+                    if valueType in (unicode, UUID):
+                        fields[fieldName] = valueType(value)
</ins><span class="cx"> 
</span><del>-                else:
-                    raise LDAPConfigurationError(
-                        &quot;Unknown value type {0} for field {1}&quot;.format(
-                            valueType, fieldName
</del><ins>+                    else:
+                        raise LDAPConfigurationError(
+                            &quot;Unknown value type {0} for field {1}&quot;.format(
+                                valueType, fieldName
+                            )
</ins><span class="cx">                         )
</span><del>-                    )
</del><span class="cx"> 
</span><span class="cx">             # Set record type and uid fields
</span><span class="cx"> 
</span><span class="cx">             fields[self.fieldName.recordType] = recordType
</span><del>-            fields[self.fieldName.uid] = uid
</del><ins>+            # fields[self.fieldName.uid] = uid
</ins><span class="cx">             fields[self.fieldName.dn] = dn
</span><span class="cx"> 
</span><span class="cx">             # Make a record object from fields.
</span><span class="lines">@@ -502,17 +493,12 @@
</span><span class="cx"> 
</span><span class="cx"> 
</span><span class="cx"> 
</span><del>-def reverseDict(sourceName, source):
</del><ins>+def reverseDict(source):
</ins><span class="cx">     new = {}
</span><span class="cx"> 
</span><span class="cx">     for key, values in source.iteritems():
</span><span class="cx">         for value in values:
</span><del>-            if value in new:
-                raise LDAPConfigurationError(
-                    u&quot;{0} map has duplicate values: {1}&quot;
-                    .format(sourceName, value)
-                )
-            new[value] = key
</del><ins>+            new.setdefault(value, []).append(key)
</ins><span class="cx"> 
</span><span class="cx">     return new
</span><span class="cx"> 
</span><span class="lines">@@ -532,7 +518,7 @@
</span><span class="cx"> 
</span><span class="cx">     for recordType, schema in recordTypeSchemas.iteritems():
</span><span class="cx">         for attribute, value in schema.attributes:
</span><del>-            if recordData.get(attribute, None) != value:
</del><ins>+            if recordData.get(attribute) != value:
</ins><span class="cx">                 break
</span><span class="cx">         else:
</span><span class="cx">             return recordType
</span></span></pre>
</div>
</div>

</body>
</html>