diff options
Diffstat (limited to 'Swiften/Serializer/PayloadSerializers/VCardSerializer.cpp')
| -rw-r--r-- | Swiften/Serializer/PayloadSerializers/VCardSerializer.cpp | 206 | 
1 files changed, 173 insertions, 33 deletions
| diff --git a/Swiften/Serializer/PayloadSerializers/VCardSerializer.cpp b/Swiften/Serializer/PayloadSerializers/VCardSerializer.cpp index 1512c6c..22d59b4 100644 --- a/Swiften/Serializer/PayloadSerializers/VCardSerializer.cpp +++ b/Swiften/Serializer/PayloadSerializers/VCardSerializer.cpp @@ -13,6 +13,7 @@  #include <Swiften/Serializer/XML/XMLTextNode.h>  #include <Swiften/Serializer/XML/XMLRawTextNode.h>  #include <Swiften/StringCodecs/Base64.h> +#include <Swiften/Base/DateTime.h>  #include <Swiften/Base/foreach.h>  namespace Swift { @@ -23,49 +24,33 @@ VCardSerializer::VCardSerializer() : GenericPayloadSerializer<VCard>() {  std::string VCardSerializer::serializePayload(boost::shared_ptr<VCard> vcard)  const {  	XMLElement queryElement("vCard", "vcard-temp");  	if (!vcard->getVersion().empty()) { -		boost::shared_ptr<XMLElement> versionElement(new XMLElement("VERSION")); -		versionElement->addNode(boost::make_shared<XMLTextNode>(vcard->getVersion())); -		queryElement.addNode(versionElement); +		queryElement.addNode(boost::make_shared<XMLElement>("VERSION", "", vcard->getVersion()));  	}  	if (!vcard->getFullName().empty()) { -		boost::shared_ptr<XMLElement> fullNameElement(new XMLElement("FN")); -		fullNameElement->addNode(boost::make_shared<XMLTextNode>(vcard->getFullName())); -		queryElement.addNode(fullNameElement); +		queryElement.addNode(boost::make_shared<XMLElement>("FN", "", vcard->getFullName()));  	}  	if (!vcard->getGivenName().empty() || !vcard->getFamilyName().empty() || !vcard->getMiddleName().empty() || !vcard->getPrefix().empty() || !vcard->getSuffix().empty()) {  		boost::shared_ptr<XMLElement> nameElement(new XMLElement("N"));  		if (!vcard->getFamilyName().empty()) { -			boost::shared_ptr<XMLElement> familyNameElement(new XMLElement("FAMILY")); -			familyNameElement->addNode(boost::make_shared<XMLTextNode>(vcard->getFamilyName())); -			nameElement->addNode(familyNameElement); +			nameElement->addNode(boost::make_shared<XMLElement>("FAMILY", "", vcard->getFamilyName()));  		}  		if (!vcard->getGivenName().empty()) { -			boost::shared_ptr<XMLElement> givenNameElement(new XMLElement("GIVEN")); -			givenNameElement->addNode(boost::make_shared<XMLTextNode>(vcard->getGivenName())); -			nameElement->addNode(givenNameElement); +			nameElement->addNode(boost::make_shared<XMLElement>("GIVEN", "", vcard->getGivenName()));  		}  		if (!vcard->getMiddleName().empty()) { -			boost::shared_ptr<XMLElement> middleNameElement(new XMLElement("MIDDLE")); -			middleNameElement->addNode(boost::make_shared<XMLTextNode>(vcard->getMiddleName())); -			nameElement->addNode(middleNameElement); +			nameElement->addNode(boost::make_shared<XMLElement>("MIDDLE", "", vcard->getMiddleName()));  		}  		if (!vcard->getPrefix().empty()) { -			boost::shared_ptr<XMLElement> prefixElement(new XMLElement("PREFIX")); -			prefixElement->addNode(boost::make_shared<XMLTextNode>(vcard->getPrefix())); -			nameElement->addNode(prefixElement); +			nameElement->addNode(boost::make_shared<XMLElement>("PREFIX", "", vcard->getPrefix()));  		}  		if (!vcard->getSuffix().empty()) { -			boost::shared_ptr<XMLElement> suffixElement(new XMLElement("SUFFIX")); -			suffixElement->addNode(boost::make_shared<XMLTextNode>(vcard->getSuffix())); -			nameElement->addNode(suffixElement); +			nameElement->addNode(boost::make_shared<XMLElement>("SUFFIX", "", vcard->getSuffix()));  		}  		queryElement.addNode(nameElement);  	}  	foreach(const VCard::EMailAddress& emailAddress, vcard->getEMailAddresses()) {  		boost::shared_ptr<XMLElement> emailElement(new XMLElement("EMAIL")); -		boost::shared_ptr<XMLElement> userIDElement(new XMLElement("USERID")); -		userIDElement->addNode(boost::make_shared<XMLTextNode>(emailAddress.address)); -		emailElement->addNode(userIDElement); +		emailElement->addNode(boost::make_shared<XMLElement>("USERID", "", emailAddress.address));  		if (emailAddress.isHome) {  			emailElement->addNode(boost::make_shared<XMLElement>("HOME"));  		} @@ -84,24 +69,179 @@ std::string VCardSerializer::serializePayload(boost::shared_ptr<VCard> vcard)  c  		queryElement.addNode(emailElement);  	}  	if (!vcard->getNickname().empty()) { -		boost::shared_ptr<XMLElement> nickElement(new XMLElement("NICKNAME")); -		nickElement->addNode(boost::make_shared<XMLTextNode>(vcard->getNickname())); -		queryElement.addNode(nickElement); +		queryElement.addNode(boost::make_shared<XMLElement>("NICKNAME", "", vcard->getNickname()));  	}  	if (!vcard->getPhoto().empty() || !vcard->getPhotoType().empty()) {  		XMLElement::ref photoElement(new XMLElement("PHOTO"));  		if (!vcard->getPhotoType().empty()) { -			XMLElement::ref typeElement(new XMLElement("TYPE")); -			typeElement->addNode(XMLTextNode::ref(new XMLTextNode(vcard->getPhotoType()))); -			photoElement->addNode(typeElement); +			photoElement->addNode(boost::make_shared<XMLElement>("TYPE", "", vcard->getPhotoType()));  		}  		if (!vcard->getPhoto().empty()) { -			XMLElement::ref binvalElement(new XMLElement("BINVAL")); -			binvalElement->addNode(XMLTextNode::ref(new XMLTextNode(Base64::encode(vcard->getPhoto())))); -			photoElement->addNode(binvalElement); +			photoElement->addNode(boost::make_shared<XMLElement>("BINVAL", "", Base64::encode(vcard->getPhoto())));  		}  		queryElement.addNode(photoElement);  	} +	if (!vcard->getBirthday().is_not_a_date_time()) { +		queryElement.addNode(boost::make_shared<XMLElement>("BDAY", "", dateTimeToString(vcard->getBirthday()))); +	} + +	foreach(const VCard::Telephone& telephone, vcard->getTelephones()) { +		boost::shared_ptr<XMLElement> telElement(new XMLElement("TEL")); +		telElement->addNode(boost::make_shared<XMLElement>("NUMBER", "", telephone.number)); +		if (telephone.isHome) { +			telElement->addNode(boost::make_shared<XMLElement>("HOME")); +		} +		if (telephone.isWork) { +			telElement->addNode(boost::make_shared<XMLElement>("WORK")); +		} +		if (telephone.isVoice) { +			telElement->addNode(boost::make_shared<XMLElement>("VOICE")); +		} +		if (telephone.isFax) { +			telElement->addNode(boost::make_shared<XMLElement>("FAX")); +		} +		if (telephone.isPager) { +			telElement->addNode(boost::make_shared<XMLElement>("PAGER")); +		} +		if (telephone.isMSG) { +			telElement->addNode(boost::make_shared<XMLElement>("MSG")); +		} +		if (telephone.isCell) { +			telElement->addNode(boost::make_shared<XMLElement>("CELL")); +		} +		if (telephone.isVideo) { +			telElement->addNode(boost::make_shared<XMLElement>("VIDEO")); +		} +		if (telephone.isBBS) { +			telElement->addNode(boost::make_shared<XMLElement>("BBS")); +		} +		if (telephone.isModem) { +			telElement->addNode(boost::make_shared<XMLElement>("MODEM")); +		} +		if (telephone.isISDN) { +			telElement->addNode(boost::make_shared<XMLElement>("ISDN")); +		} +		if (telephone.isPCS) { +			telElement->addNode(boost::make_shared<XMLElement>("PCS")); +		} +		if (telephone.isPreferred) { +			telElement->addNode(boost::make_shared<XMLElement>("PREF")); +		} +		queryElement.addNode(telElement); +	} + +	foreach(const VCard::Address& address, vcard->getAddresses()) { +		boost::shared_ptr<XMLElement> adrElement = boost::make_shared<XMLElement>("ADR"); +		if (!address.poBox.empty()) { +			adrElement->addNode(boost::make_shared<XMLElement>("POBOX", "", address.poBox)); +		} +		if (!address.addressExtension.empty()) { +			adrElement->addNode(boost::make_shared<XMLElement>("EXTADD", "", address.addressExtension)); +		} +		if (!address.street.empty()) { +			adrElement->addNode(boost::make_shared<XMLElement>("STREET", "", address.street)); +		} +		if (!address.locality.empty()) { +			adrElement->addNode(boost::make_shared<XMLElement>("LOCALITY", "", address.locality)); +		} +		if (!address.region.empty()) { +			adrElement->addNode(boost::make_shared<XMLElement>("REGION", "", address.region)); +		} +		if (!address.postalCode.empty()) { +			adrElement->addNode(boost::make_shared<XMLElement>("PCODE", "", address.postalCode)); +		} +		if (!address.country.empty()) { +			adrElement->addNode(boost::make_shared<XMLElement>("CTRY", "", address.country)); +		} + +		if (address.isHome) { +			adrElement->addNode(boost::make_shared<XMLElement>("HOME")); +		} +		if (address.isWork) { +			adrElement->addNode(boost::make_shared<XMLElement>("WORK")); +		} +		if (address.isPostal) { +			adrElement->addNode(boost::make_shared<XMLElement>("POSTAL")); +		} +		if (address.isParcel) { +			adrElement->addNode(boost::make_shared<XMLElement>("PARCEL")); +		} +		if (address.deliveryType == VCard::DomesticDelivery) { +			adrElement->addNode(boost::make_shared<XMLElement>("DOM")); +		} +		if (address.deliveryType == VCard::InternationalDelivery) { +			adrElement->addNode(boost::make_shared<XMLElement>("INTL")); +		} +		if (address.isPreferred) { +			adrElement->addNode(boost::make_shared<XMLElement>("PREF")); +		} +		queryElement.addNode(adrElement); +	} + +	foreach(const VCard::AddressLabel& addressLabel, vcard->getAddressLabels()) { +		boost::shared_ptr<XMLElement> labelElement = boost::make_shared<XMLElement>("LABEL"); + +		foreach(const std::string& line, addressLabel.lines) { +			labelElement->addNode(boost::make_shared<XMLElement>("LINE", "", line)); +		} + +		if (addressLabel.isHome) { +			labelElement->addNode(boost::make_shared<XMLElement>("HOME")); +		} +		if (addressLabel.isWork) { +			labelElement->addNode(boost::make_shared<XMLElement>("WORK")); +		} +		if (addressLabel.isPostal) { +			labelElement->addNode(boost::make_shared<XMLElement>("POSTAL")); +		} +		if (addressLabel.isParcel) { +			labelElement->addNode(boost::make_shared<XMLElement>("PARCEL")); +		} +		if (addressLabel.deliveryType == VCard::DomesticDelivery) { +			labelElement->addNode(boost::make_shared<XMLElement>("DOM")); +		} +		if (addressLabel.deliveryType == VCard::InternationalDelivery) { +			labelElement->addNode(boost::make_shared<XMLElement>("INTL")); +		} +		if (addressLabel.isPreferred) { +			labelElement->addNode(boost::make_shared<XMLElement>("PREF")); +		} +		queryElement.addNode(labelElement); +	} + +	foreach(const JID& jid, vcard->getJIDs()) { +		queryElement.addNode(boost::make_shared<XMLElement>("JID", "", jid.toString())); +	} + +	if (!vcard->getDescription().empty()) { +		queryElement.addNode(boost::make_shared<XMLElement>("DESC", "", vcard->getDescription())); +	} + +	foreach(const VCard::Organization& org, vcard->getOrganizations()) { +		boost::shared_ptr<XMLElement> orgElement = boost::make_shared<XMLElement>("ORG"); +		if (!org.name.empty()) { +			orgElement->addNode(boost::make_shared<XMLElement>("ORGNAME", "", org.name)); +		} +		if (!org.units.empty()) { +			foreach(const std::string& unit, org.units) { +				orgElement->addNode(boost::make_shared<XMLElement>("ORGUNIT", "", unit)); +			} +		} +		queryElement.addNode(orgElement); +	} + +	foreach(const std::string& title, vcard->getTitles()) { +		queryElement.addNode(boost::make_shared<XMLElement>("TITLE", "", title)); +	} + +	foreach(const std::string& role, vcard->getRoles()) { +		queryElement.addNode(boost::make_shared<XMLElement>("ROLE", "", role)); +	} + +	foreach(const std::string& url, vcard->getURLs()) { +		queryElement.addNode(boost::make_shared<XMLElement>("URL", "", url)); +	} +  	if (!vcard->getUnknownContent().empty()) {  		queryElement.addNode(boost::make_shared<XMLRawTextNode>(vcard->getUnknownContent()));  	} | 
 Swift
 Swift