Changeset 2320

Timestamp:

07/12/07 12:31:06 (1 year ago)

Author:

abaumann

Message:

hack around some problems with address mappings:

• addresses without a location are assumed to be Home addresses
  
• don't uppercase the location when generating XML
  

Files:

• plugins/moto-sync/motosync.py (modified) (3 diffs)

plugins/moto-sync/motosync.py

@@ -1850 +1850 @@
-
-        # process addresses, create a hash from contacttype to address
-FIXME: 
+
-        addresses = {}
-        for adr in doc.getElementsByTagName('Address'):
-            address = [getXMLField(adr, p) for p in XML_ADDRESS_PARTS]
-            ical_types = adr.getAttribute('Location').split(';')
+            # XXX: HACK: if it has no type, assume it's a home address
+            if ical_types == [] or ical_types == ['']:
+                ical_types = ['Home']
-            for t in ical_types:
-                t = t.lower()
@@ -1863 +1866 @@
-
-        # create a child for each telephone/address pair or email
+        # addresses for which there is no phone number are dropped
-        for (moto_type, contact, is_pref) in contacts:
-            if moto_type == MOTO_CONTACT_EMAIL:
@@ -1957 +1961 @@
-            if e.hasChildNodes():
-                if MOTO_ADDRESS_TYPES.has_key(self.contacttype):
-.upper()
+
-                ret.append(e)
-