diff options
| -rw-r--r-- | addressbook/ChangeLog | 8 | ||||
| -rw-r--r-- | addressbook/backend/pas/evolutionperson.schema (renamed from addressbook/backend/pas/evolveperson.schema) | 95 | ||||
| -rw-r--r-- | addressbook/backend/pas/pas-backend-ldap.c | 20 |
3 files changed, 95 insertions, 28 deletions
diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog index 943d76cc4b..ce66ca2841 100644 --- a/addressbook/ChangeLog +++ b/addressbook/ChangeLog @@ -1,3 +1,11 @@ +2001-03-02 Chris Toshok <toshok@ximian.com> + + * backend/pas/evolutionperson.schema: rename evolveperson.schema + to this, and add remaining attributes. + + * backend/pas/pas-backend-ldap.c: add remaining fields, and fix up + ones that were incorrent (either the ldap_attr or the query prop). + 2001-03-02 JP Rosevear <jpr@ximian.com> * conduit/Makefile.am: update sed script diff --git a/addressbook/backend/pas/evolveperson.schema b/addressbook/backend/pas/evolutionperson.schema index b23e97cd15..5fc41cc9f6 100644 --- a/addressbook/backend/pas/evolveperson.schema +++ b/addressbook/backend/pas/evolutionperson.schema @@ -12,7 +12,7 @@ # The Internet Organizational Person Schema (inetorgperson) # primaryPhone -attributetype ( 666.666.666.1 +attributetype ( 666.666.666.1.1 NAME 'primaryPhone' DESC 'preferred phone number used to contact a person' EQUALITY caseIgnoreMatch @@ -21,7 +21,7 @@ attributetype ( 666.666.666.1 SINGLE-VALUE ) # carPhone -attributetype ( 666.666.666.2 +attributetype ( 666.666.666.1.2 NAME 'carPhone' DESC 'car phone telephone number of the person' EQUALITY telephoneNumberMatch @@ -29,81 +29,132 @@ attributetype ( 666.666.666.2 SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 SINGLE-VALUE ) -attributetype ( 666.666.666.3 +attributetype ( 666.666.666.1.3 NAME ( 'homeFacsimileTelephoneNumber' 'homeFax' ) EQUALITY caseIgnoreMatch SUBSTR caseIgnoreSubstringsMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.22 ) -attributetype ( 666.666.666.4 +attributetype ( 666.666.666.1.4 NAME 'otherPhone' EQUALITY telephoneNumberMatch SUBSTR telephoneNumberSubstringsMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 ) -attributetype ( 666.666.666.5 +attributetype ( 666.666.666.1.5 NAME 'businessRole' EQUALITY caseIgnoreMatch SUBSTR caseIgnoreSubstringsMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 ) -attributetype ( 666.666.666.6 +attributetype ( 666.666.666.1.6 NAME 'managerName' SUP name ) -attributetype ( 666.666.666.7 +attributetype ( 666.666.666.1.7 NAME 'assistantName' SUP name ) # spouseName # single valued (/me smirks) -attributetype ( 666.666.666.8 +attributetype ( 666.666.666.1.8 NAME 'spouseName' SUP name SINGLE-VALUE ) -attributetype ( 666.666.666.9 +attributetype ( 666.666.666.1.9 NAME 'otherPostalAddress' EQUALITY caseIgnoreListMatch SUBSTR caseIgnoreListSubstringsMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.41 ) -attributetype ( 666.666.666.10 +attributetype ( 666.666.666.1.10 NAME ( 'mailer' 'mua' ) EQUALITY caseIgnoreMatch SUBSTR caseIgnoreSubstringsMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{32} ) -attributetype ( 666.666.666.11 +attributetype ( 666.666.666.1.11 NAME ( 'birthDate' 'dob' ) EQUALITY caseIgnoreMatch SUBSTR caseIgnoreSubstringsMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{128} ) -attributetype ( 666.666.666.12 +attributetype ( 666.666.666.1.12 NAME 'anniversary' EQUALITY caseIgnoreMatch SUBSTR caseIgnoreSubstringsMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{128} ) -attributetype ( 666.666.666.13 +attributetype ( 666.666.666.1.13 NAME 'note' EQUALITY caseIgnoreMatch SUBSTR caseIgnoreSubstringsMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{1024} ) -# inetOrgPerson -# The inetOrgPerson represents people who are associated with an -# organization in some way. It is a structural class and is derived -# from the organizationalPerson which is defined in X.521 [X521]. -objectclass ( 666.666.666.14 - NAME 'evolvePerson' +attributetype ( 666.666.666.1.14 + NAME 'evolutionArbitrary' + EQUALITY caseIgnoreMatch + SUBSTR caseIgnoreSubstringsMatch + SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{4096} ) + ) + +attributetype ( 666.666.666.1.15 + NAME 'fileAs' + SUP name ) + +attributetype ( 666.666.666.1.16 + NAME 'assistantPhone' + EQUALITY telephoneNumberMatch + SUBSTR telephoneNumberSubstringsMatch + SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 ) + +attributetype ( 666.666.666.1.17 + NAME 'companyPhone' + EQUALITY telephoneNumberMatch + SUBSTR telephoneNumberSubstringsMatch + SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 ) + +attributetype ( 666.666.666.1.18 + NAME 'callbackPhone' + EQUALITY telephoneNumberMatch + SUBSTR telephoneNumberSubstringsMatch + SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 ) + +attributetype ( 666.666.666.1.19 + NAME ( 'otherFacsimileTelephoneNumber' 'otherFax' ) + EQUALITY telephoneNumberMatch + SUBSTR telephoneNumberSubstringsMatch + SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 ) + +attributetype ( 666.666.666.1.20 + NAME 'radio' + EQUALITY telephoneNumberMatch + SUBSTR telephoneNumberSubstringsMatch + SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 ) + +attributetype ( 666.666.666.1.21 + NAME 'telex' + EQUALITY telephoneNumberMatch + SUBSTR telephoneNumberSubstringsMatch + SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 ) + +attributetype ( 666.666.666.1.22 + NAME 'tty' + EQUALITY telephoneNumberMatch + SUBSTR telephoneNumberSubstringsMatch + SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 ) + +# evolutionPerson +objectclass ( 666.666.666.2.1 + NAME 'evolutionPerson' DESC 'Objectclass geared to Evolution Usage' SUP inetOrgPerson STRUCTURAL MAY ( - primaryPhone $ carPhone $ homeFacsimileTelephoneNumber $ - otherPhone $ businessRole $ managerName $ assistantName $ + fileAs $ primaryPhone $ carPhone $ homeFacsimileTelephoneNumber $ + otherPhone $ businessRole $ managerName $ assistantName $ assistantPhone $ otherPostalAddress $ mailer $ birthDate $ anniversary $ spouseName $ - note ) + note $ companyPhone $ callbackPhone $ otherFacsimileTelephoneNumber $ + radio $ telex $ tty ) ) diff --git a/addressbook/backend/pas/pas-backend-ldap.c b/addressbook/backend/pas/pas-backend-ldap.c index 561ed64153..9b5f2bc435 100644 --- a/addressbook/backend/pas/pas-backend-ldap.c +++ b/addressbook/backend/pas/pas-backend-ldap.c @@ -171,16 +171,23 @@ struct prop_info { LIST_PROP (E_CARD_SIMPLE_FIELD_EMAIL, "email", "mail", email_populate, email_ber, email_compare), /* phone numbers */ - E_STRING_PROP (E_CARD_SIMPLE_FIELD_PHONE_PRIMARY, "phone", "primaryPhone"), + E_STRING_PROP (E_CARD_SIMPLE_FIELD_PHONE_PRIMARY, "primary_phone", "primaryPhone"), LIST_PROP (E_CARD_SIMPLE_FIELD_PHONE_BUSINESS, "business_phone", "telephoneNumber", business_populate, business_ber, business_compare), LIST_PROP (E_CARD_SIMPLE_FIELD_PHONE_HOME, "home_phone", "homePhone", homephone_populate, homephone_ber, homephone_compare), - STRING_PROP (E_CARD_SIMPLE_FIELD_PHONE_MOBILE, "mobile", "mobile"), - E_STRING_PROP (E_CARD_SIMPLE_FIELD_PHONE_CAR, "car", "carPhone"), + STRING_PROP (E_CARD_SIMPLE_FIELD_PHONE_MOBILE, "mobile_phone", "mobile"), + E_STRING_PROP (E_CARD_SIMPLE_FIELD_PHONE_CAR, "car_phone", "carPhone"), STRING_PROP (E_CARD_SIMPLE_FIELD_PHONE_BUSINESS_FAX, "business_fax", "facsimileTelephoneNumber"), E_STRING_PROP (E_CARD_SIMPLE_FIELD_PHONE_HOME_FAX, "home_fax", "homeFacsimileTelephoneNumber"), E_STRING_PROP (E_CARD_SIMPLE_FIELD_PHONE_OTHER, "other_phone", "otherPhone"), - STRING_PROP (E_CARD_SIMPLE_FIELD_PHONE_ISDN, "isdn", "internationalISDNNumber"), + E_STRING_PROP (E_CARD_SIMPLE_FIELD_PHONE_OTHER, "other_fax", "otherFacsimileTelephoneNumber"), + STRING_PROP (E_CARD_SIMPLE_FIELD_PHONE_ISDN, "isdn", "internationaliSDNNumber"), STRING_PROP (E_CARD_SIMPLE_FIELD_PHONE_PAGER, "pager", "pager"), + E_STRING_PROP (E_CARD_SIMPLE_FIELD_PHONE_RADIO, "radio", "radio"), + E_STRING_PROP (E_CARD_SIMPLE_FIELD_PHONE_TELEX, "telex", "telex"), + E_STRING_PROP (E_CARD_SIMPLE_FIELD_PHONE_ASSISTANT, "assistant_phone", "assistantPhone"), + E_STRING_PROP (E_CARD_SIMPLE_FIELD_PHONE_COMPANY, "company_phone", "companyPhone"), + E_STRING_PROP (E_CARD_SIMPLE_FIELD_PHONE_CALLBACK, "callback_phone", "callbackPhone"), + E_STRING_PROP (E_CARD_SIMPLE_FIELD_PHONE_TTYTTD, "tty", "tty"), /* org information */ STRING_PROP (E_CARD_SIMPLE_FIELD_ORG, "org", "o"), @@ -197,7 +204,7 @@ struct prop_info { E_STRING_PROP (E_CARD_SIMPLE_FIELD_ADDRESS_OTHER, "other_address", "otherPostalAddress"), /* misc fields */ - STRING_PROP (E_CARD_SIMPLE_FIELD_URL, "uri", "labeledURI"), + STRING_PROP (E_CARD_SIMPLE_FIELD_URL, "url", "labeledURI"), /* map nickname to displayName */ STRING_PROP (E_CARD_SIMPLE_FIELD_NICKNAME, "nickname", "displayName"), E_STRING_PROP (E_CARD_SIMPLE_FIELD_SPOUSE, "spouse", "spouseName"), @@ -206,7 +213,8 @@ struct prop_info { E_STRING_PROP (E_CARD_SIMPLE_FIELD_BIRTH_DATE, "birth_date", "birthDate"), E_STRING_PROP (E_CARD_SIMPLE_FIELD_MAILER, "mailer", "mailer"), -/* E_CARD_SIMPLE_FIELD_FILE_AS, */ + E_STRING_PROP (E_CARD_SIMPLE_FIELD_FILE_AS, "file_as", "fileAs"), + /* E_CARD_SIMPLE_FIELD_FBURL, */ /* E_CARD_SIMPLE_FIELD_NAME_OR_ORG, */ |