X-Git-Url: http://Server1/repobrowser/?a=blobdiff_plain;f=source%2Fcontacteditor%2FContactDataObject.cpp;h=28c12b32c522cb79f27df3fe385265dd3ed9c84e;hb=45bd26d628a5b2832d3598a43a3d013b59a8896e;hp=2a7f6a4839fd9c296d23381b085d61a751060581;hpb=ac5416e95caeeefefdbf9706b65926f6b75589cf;p=xestiaab%2F.git

diff --git a/source/contacteditor/ContactDataObject.cpp b/source/contacteditor/ContactDataObject.cpp
index 2a7f6a4..28c12b3 100644
--- a/source/contacteditor/ContactDataObject.cpp
+++ b/source/contacteditor/ContactDataObject.cpp
@@ -84,6 +84,10 @@ ContactLoadStatus ContactDataObject::LoadFile(wxString Filename){
 	int FNCount = 0;
 	int NicknameCount = 0;
 	int TimeZoneCount = 0;
+	int AddressCount = 0;
+	int EmailCount = 0;
+	int IMCount = 0;
+	int TelephoneCount = 0;
 	wxString ContactLine;
 	wxString PropertyLine;
 	wxString PropertySeg1;
@@ -226,6 +230,26 @@ ContactLoadStatus ContactDataObject::LoadFile(wxString Filename){
 			ProcessTimeZone(PropertySeg1, PropertySeg2, &TimeZoneCount);
 			TimeZoneCount++;
 		
+		} else if (Property == wxT("ADR")){
+		
+			ProcessAddress(PropertySeg1, PropertySeg2, &AddressCount);
+			AddressCount++;
+		
+		} else if (Property == wxT("EMAIL")){
+					
+			ProcessEmail(PropertySeg1, PropertySeg2, &EmailCount);	
+			EmailCount++;
+		
+		} else if (Property == wxT("IMPP")){
+		
+			ProcessIM(PropertySeg1, PropertySeg2, &IMCount);
+			IMCount++;
+			
+		} else if (Property == wxT("TEL")){
+				
+			ProcessTelephone(PropertySeg1, PropertySeg2, &TelephoneCount);
+			TelephoneCount++;
+		
 		}
 		
 	}
@@ -631,7 +655,7 @@ void ContactDataObject::ProcessNickname(wxString PropertySeg1, wxString Property
 	
 	intPrevValue = 9;
 	
-	PropertyType PropType;
+	PropertyType PropType = PROPERTY_NONE;
 	
 	// Look for type before continuing.
 	
@@ -1122,7 +1146,7 @@ void ContactDataObject::ProcessTimeZone(wxString PropertySeg1, wxString Property
 	
 	intPrevValue = 3;
 	
-	PropertyType PropType;
+	PropertyType PropType = PROPERTY_NONE;
 	
 	// Look for type before continuing.
 	
@@ -1262,6 +1286,973 @@ void ContactDataObject::ProcessTimeZone(wxString PropertySeg1, wxString Property
 
 }
 
+void ContactDataObject::ProcessAddress(wxString PropertySeg1, wxString PropertySeg2, int *AddressCount){
+
+	size_t intPropertyLen = PropertySeg1.Len();
+	std::map<int, int> SplitPoints;
+	std::map<int, int> SplitLength;
+	std::map<int, int>::iterator SLiter;			
+	wxString PropertyData;
+	wxString PropertyName;
+	wxString PropertyValue;
+	wxString PropertyTokens;
+	wxString AddressLabel;
+	wxString AddressLang;
+	wxString AddressAltID;
+	wxString AddressPID;
+	wxString AddressTokens;
+	wxString AddressGeo;
+	wxString AddressTimezone;
+	wxString AddressType;
+	wxString AddressMediatype;
+	wxString AddressPOBox;
+	wxString AddressExtended;
+	wxString AddressStreet;
+	wxString AddressLocality;
+	wxString AddressCity;
+	wxString AddressRegion;
+	wxString AddressPostalCode;
+	wxString AddressCountry;
+	bool FirstToken = TRUE;			
+	int intSplitsFound = 0;
+	int intSplitSize = 0;
+	int intPrevValue = 5;
+	int intPref = 0;			
+	int intType = 0;
+	long ListCtrlIndex;
+	
+	SplitValues(&PropertySeg1, &SplitPoints, &SplitLength, intPrevValue);
+	
+	intPrevValue = 4;
+	
+	PropertyType PropType = PROPERTY_NONE;
+		
+	// Look for type before continuing.
+	
+	CheckType(&PropertySeg1, &SplitPoints, &SplitLength, &intPrevValue, &PropType);
+	
+	intPrevValue = 4;
+	
+	std::map<int, wxString> *AddressList = NULL;
+	std::map<int, wxString> *AddressListTown = NULL;
+	std::map<int, wxString> *AddressListCounty = NULL;
+	std::map<int, wxString> *AddressListPostCode = NULL;
+	std::map<int, wxString> *AddressListCountry = NULL;
+	std::map<int, wxString> *AddressListLabel = NULL;
+	std::map<int, wxString> *AddressListLang = NULL;		
+	std::map<int, wxString> *AddressListAltID = NULL;
+	std::map<int, wxString> *AddressListPID = NULL;
+	std::map<int, wxString> *AddressListTokens = NULL;
+	std::map<int, wxString> *AddressListGeo = NULL;
+	std::map<int, wxString> *AddressListTimezone = NULL;		
+	std::map<int, wxString> *AddressListType = NULL;
+	std::map<int, wxString> *AddressListMediatype = NULL;
+	std::map<int, int> *AddressListPref = NULL;
+
+	switch(PropType){
+		case PROPERTY_NONE:
+			AddressList = &GeneralAddressList;
+			AddressListTown = &GeneralAddressListTown;
+			AddressListCounty = &GeneralAddressListCounty;
+			AddressListPostCode = &GeneralAddressListPostCode;
+			AddressListCountry = &GeneralAddressListCountry;
+			AddressListLabel = &GeneralAddressListLabel;
+			AddressListLang = &GeneralAddressListLang;		
+			AddressListAltID = &GeneralAddressListAltID;
+			AddressListPID = &GeneralAddressListPID;
+			AddressListTokens = &GeneralAddressListTokens;
+			AddressListGeo = &GeneralAddressListGeo;
+			AddressListTimezone = &GeneralAddressListTimezone;
+			AddressListType = &GeneralAddressListType;
+			AddressListMediatype = &GeneralAddressListMediatype;
+			AddressListPref = &GeneralAddressListPref;		
+			break;
+		case PROPERTY_HOME:
+			AddressList = &HomeAddressList;
+			AddressListTown = &HomeAddressListTown;
+			AddressListCounty = &HomeAddressListCounty;
+			AddressListPostCode = &HomeAddressListPostCode;
+			AddressListCountry = &HomeAddressListCountry;
+			AddressListLabel = &HomeAddressListLabel;
+			AddressListLang = &HomeAddressListLang;		
+			AddressListAltID = &HomeAddressListAltID;
+			AddressListPID = &HomeAddressListPID;
+			AddressListTokens = &HomeAddressListTokens;
+			AddressListGeo = &HomeAddressListGeo;
+			AddressListTimezone = &HomeAddressListTimezone;
+			AddressListType = &HomeAddressListType;
+			AddressListMediatype = &HomeAddressListMediatype;
+			AddressListPref = &HomeAddressListPref;
+			break;
+		case PROPERTY_WORK:
+			AddressList = &BusinessAddressList;
+			AddressListTown = &BusinessAddressListTown;
+			AddressListCounty = &BusinessAddressListCounty;
+			AddressListPostCode = &BusinessAddressListPostCode;
+			AddressListCountry = &BusinessAddressListCountry;
+			AddressListLabel = &BusinessAddressListLabel;
+			AddressListLang = &BusinessAddressListLang;		
+			AddressListAltID = &BusinessAddressListAltID;
+			AddressListPID = &BusinessAddressListPID;
+			AddressListTokens = &BusinessAddressListTokens;
+			AddressListGeo = &BusinessAddressListGeo;
+			AddressListTimezone = &BusinessAddressListTimezone;
+			AddressListType = &BusinessAddressListType;
+			AddressListMediatype = &BusinessAddressListMediatype;
+			AddressListPref = &BusinessAddressListPref;
+			break;
+	}
+	
+	intPrevValue = 4;
+	
+	for (std::map<int, int>::iterator intiter = SplitPoints.begin(); 
+	intiter != SplitPoints.end(); ++intiter){
+	
+		SLiter = SplitLength.find(intiter->first);
+	
+		PropertyData = PropertySeg1.Mid(intPrevValue, (SLiter->second));
+		
+		wxStringTokenizer PropertyElement (PropertyData, wxT("="));
+		PropertyName = PropertyElement.GetNextToken();				
+		PropertyValue = PropertyElement.GetNextToken();
+		
+		intPrevValue = intiter->second;
+		
+		CaptureString(&PropertyValue, FALSE);
+		
+		// Process properties.
+		
+		if (PropertyName == wxT("LABEL")){
+		
+			AddressListLabel->erase(*AddressCount);
+			AddressListLabel->insert(std::make_pair(*AddressCount, PropertyValue));
+				
+		} else if (PropertyName == wxT("LANGUAGE")){
+		
+			AddressListLang->erase(*AddressCount);
+			AddressListLang->insert(std::make_pair(*AddressCount, PropertyValue));			
+		
+		} else if (PropertyName == wxT("ALTID")){
+
+			AddressListAltID->erase(*AddressCount);
+			AddressListAltID->insert(std::make_pair(*AddressCount, PropertyValue));
+		
+		} else if (PropertyName == wxT("PID")){
+
+			AddressListPID->erase(*AddressCount);
+			AddressListPID->insert(std::make_pair(*AddressCount, PropertyValue));
+		
+		} else if (PropertyName == wxT("GEO")){
+		
+			AddressListGeo->erase(*AddressCount);
+			AddressListGeo->insert(std::make_pair(*AddressCount, PropertyValue));
+		
+		} else if (PropertyName == wxT("TZ")){
+
+			AddressListTimezone->erase(*AddressCount);
+			AddressListTimezone->insert(std::make_pair(*AddressCount, PropertyValue));
+		
+		} else if (PropertyName == wxT("MEDIATYPE")){
+
+			AddressListMediatype->erase(*AddressCount);
+			AddressListMediatype->insert(std::make_pair(*AddressCount, PropertyValue));
+		
+		} else if (PropertyName == wxT("PREF")){
+			
+			int PriorityNumber = 0;
+			bool ValidNumber = TRUE;
+			
+			try{
+				PriorityNumber = std::stoi(PropertyValue.ToStdString());
+			}
+			
+			catch(std::invalid_argument &e){
+				ValidNumber = FALSE;
+			}
+
+			if (ValidNumber == TRUE){
+
+				AddressListPref->erase(*AddressCount);
+				AddressListPref->insert(std::make_pair(*AddressCount, PriorityNumber));
+
+			}
+		
+		} else {
+		
+			if (!PropertyName.IsEmpty() && !PropertyValue.IsEmpty() && PropertyName != wxT("TYPE")){
+			
+				if (FirstToken == TRUE){
+				
+					PropertyTokens.Append(PropertyName + wxT("=") + PropertyValue);
+					FirstToken = FALSE;
+				
+				} else {
+				
+					PropertyTokens.Append(wxT(";") + PropertyName + wxT("=") + PropertyValue);
+				
+				}
+			
+			}
+		
+		}
+	
+	}			
+	
+	// Split the address. 
+
+	//std::map<int, int>::iterator SLiter;
+	intPropertyLen = PropertySeg2.Len();
+	SplitPoints.clear();
+	SplitLength.clear();
+	intSplitsFound = 0;
+	intSplitSize = 0;
+	intPrevValue = 0;
+	
+	for (int i = 0; i <= intPropertyLen; i++){
+
+		intSplitSize++;
+	
+		if (PropertySeg2.Mid(i, 1) == wxT(";") && PropertySeg2.Mid((i - 1), 1) != wxT("\\")){
+	
+			intSplitsFound++;
+			SplitPoints.insert(std::make_pair(intSplitsFound, (i + 1)));
+			
+			if (intSplitsFound == 6){ 
+			
+				SplitLength.insert(std::make_pair(intSplitsFound, (intSplitSize - 1)));
+				break; 
+				
+			} else {
+			
+				SplitLength.insert(std::make_pair(intSplitsFound, (intSplitSize - 1)));
+			
+			}
+			
+			intSplitSize = 0;					
+	
+		}
+
+	}
+	
+	// Split the data into several parts.			
+	
+	for (std::map<int, int>::iterator intiter = SplitPoints.begin(); 
+	intiter != SplitPoints.end(); ++intiter){
+			
+		if (intiter->first == 1){
+		
+			// Deal with PO Box.
+			
+			SLiter = SplitLength.find(1);
+								
+			//txtSurname->SetValue(ContactData.Convert(wxSPropertySeg2.Mid(0, SLiter->second), TRUE));
+			AddressPOBox = PropertySeg2.Mid(0, SLiter->second);
+			intPrevValue = intiter->second;
+		
+		} else if (intiter->first == 2){
+		
+			// Deal with extended address.
+			
+			SLiter = SplitLength.find(2);
+			
+			AddressExtended = PropertySeg2.Mid(intPrevValue, SLiter->second);
+			//txtForename->SetValue(ContactData.Convert(wxSPropertySeg2.Mid(intPrevValue, SLiter->second), TRUE));
+			intPrevValue = intiter->second;
+		
+		} else if (intiter->first == 3){
+		
+			// Deal with street address.
+			
+			SLiter = SplitLength.find(3);
+								
+			AddressStreet = PropertySeg2.Mid(intPrevValue, SLiter->second);
+			//txtOtherNames->SetValue(ContactData.Convert(wxSPropertySeg2.Mid(intPrevValue, SLiter->second), TRUE));
+			intPrevValue = intiter->second;
+		
+		} else if (intiter->first == 4){
+		
+			// Deal with locality
+
+			SLiter = SplitLength.find(4);
+			
+			AddressLocality = PropertySeg2.Mid(intPrevValue, SLiter->second);
+			//txtTitle->SetValue(ContactData.Convert(wxSPropertySeg2.Mid(intPrevValue, SLiter->second), TRUE));
+			intPrevValue = intiter->second;
+			
+			//txtSuffix->SetValue(ContactData.Convert(wxSPropertySeg2.Mid(intPrevValue), TRUE));
+		
+		} else if (intiter->first == 5){
+		
+			// Deal with region.
+
+			SLiter = SplitLength.find(5);
+			
+			AddressRegion = PropertySeg2.Mid(intPrevValue, SLiter->second);
+			//txtTitle->SetValue(ContactData.Convert(wxSPropertySeg2.Mid(intPrevValue, SLiter->second), TRUE));
+			intPrevValue = intiter->second;
+			
+			//txtSuffix->SetValue(ContactData.Convert(wxSPropertySeg2.Mid(intPrevValue), TRUE));
+		
+		} else if (intiter->first == 6){
+		
+			// Deal with post code.
+
+			SLiter = SplitLength.find(6);
+			
+			AddressPostalCode = PropertySeg2.Mid(intPrevValue, SLiter->second);
+			//txtTitle->SetValue(ContactData.Convert(wxSPropertySeg2.Mid(intPrevValue, SLiter->second), TRUE));
+			intPrevValue = intiter->second;
+			
+			// Deal with country.
+						
+			AddressCountry = PropertySeg2.Mid(intPrevValue, wxString::npos);
+			//txtSuffix->SetValue(ContactData.Convert(wxSPropertySeg2.Mid(intPrevValue), TRUE));
+			
+			break;
+		
+		}
+	
+	}	
+	
+	// Add the data to the General/Home/Work address variables.
+	
+	CaptureString(&AddressStreet, FALSE); 
+	CaptureString(&AddressLocality, FALSE);
+	CaptureString(&AddressRegion, FALSE);
+	CaptureString(&AddressPostalCode, FALSE);
+	CaptureString(&AddressCountry, FALSE);
+		
+	if (!PropertyTokens.IsEmpty()){
+	
+		AddressListTokens->insert(std::make_pair(*AddressCount, PropertyTokens));
+	
+	}
+
+	AddressListCountry->insert(std::make_pair(*AddressCount, AddressCountry));	
+	AddressList->insert(std::make_pair(*AddressCount, AddressStreet));
+	AddressListTown->insert(std::make_pair(*AddressCount, AddressLocality));
+	AddressListCounty->insert(std::make_pair(*AddressCount, AddressRegion));
+	AddressListPostCode->insert(std::make_pair(*AddressCount, AddressPostalCode));
+
+	switch(PropType){
+		case PROPERTY_NONE:
+			AddressListType->insert(std::make_pair(*AddressCount, wxT("")));
+			break;
+		case PROPERTY_HOME:
+			AddressListType->insert(std::make_pair(*AddressCount, wxT("home")));
+			break;
+		case PROPERTY_WORK:
+			AddressListType->insert(std::make_pair(*AddressCount, wxT("work")));	
+			break;
+	}
+	
+	AddressListTokens->insert(std::make_pair(*AddressCount, PropertyTokens));
+
+}
+
+void ContactDataObject::ProcessEmail(wxString PropertySeg1, wxString PropertySeg2, int *EmailCount){
+
+	std::map<int, int> SplitPoints;
+	std::map<int, int> SplitLength;
+
+	int intPrevValue = 7;
+	int intPref = 0;			
+	
+	SplitValues(&PropertySeg1, &SplitPoints, &SplitLength, intPrevValue);
+	
+	intPrevValue = 6;
+	
+	PropertyType PropType = PROPERTY_NONE;
+		
+	// Look for type before continuing.
+	
+	CheckType(&PropertySeg1, &SplitPoints, &SplitLength, &intPrevValue, &PropType);
+	
+	std::map<int, wxString> *EmailList = NULL;
+	std::map<int, wxString> *EmailListType = NULL;
+	std::map<int, wxString> *EmailListAltID = NULL;
+	std::map<int, wxString> *EmailListPID = NULL;
+	std::map<int, wxString> *EmailListTokens = NULL;		
+	std::map<int, int> *EmailListPref = NULL;
+
+	switch(PropType){
+		case PROPERTY_NONE:
+			EmailList = &GeneralEmailList;
+			EmailListType = &GeneralEmailListType;
+			EmailListAltID = &GeneralEmailListAltID;
+			EmailListPID = &GeneralEmailListPID;
+			EmailListTokens = &GeneralEmailListTokens;		
+			EmailListPref = &GeneralEmailListPref;	
+			break;
+		case PROPERTY_HOME:
+			EmailList = &HomeEmailList;
+			EmailListType = &HomeEmailListType;
+			EmailListAltID = &HomeEmailListAltID;
+			EmailListPID = &HomeEmailListPID;
+			EmailListTokens = &HomeEmailListTokens;		
+			EmailListPref = &HomeEmailListPref;	
+			break;
+		case PROPERTY_WORK:
+			EmailList = &BusinessEmailList;
+			EmailListType = &BusinessEmailListType;
+			EmailListAltID = &BusinessEmailListAltID;
+			EmailListPID = &BusinessEmailListPID;
+			EmailListTokens = &BusinessEmailListTokens;		
+			EmailListPref = &BusinessEmailListPref;	
+			break;
+	}
+	
+	intPrevValue = 6;
+	
+	std::map<int,int>::iterator SLiter;
+	wxString PropertyData;
+	wxString PropertyName;
+	wxString PropertyValue;
+	wxString PropertyTokens;
+	bool FirstToken = TRUE;
+	
+	for (std::map<int, int>::iterator intiter = SplitPoints.begin(); 
+	intiter != SplitPoints.end(); ++intiter){
+	
+		SLiter = SplitLength.find(intiter->first);
+	
+		PropertyData = PropertySeg1.Mid(intPrevValue, (SLiter->second));
+		
+		wxStringTokenizer PropertyElement (PropertyData, wxT("="));
+		PropertyName = PropertyElement.GetNextToken();				
+		PropertyValue = PropertyElement.GetNextToken();
+		
+		intPrevValue = intiter->second;
+		
+		CaptureString(&PropertyValue, FALSE);
+		
+		// Process properties.
+		
+		if (PropertyName == wxT("ALTID")){
+
+			EmailListAltID->erase(*EmailCount);
+			EmailListAltID->insert(std::make_pair(*EmailCount, PropertyValue));
+		
+		} else if (PropertyName == wxT("PID")){
+
+			EmailListPID->erase(*EmailCount);
+			EmailListPID->insert(std::make_pair(*EmailCount, PropertyValue));
+		
+		} else if (PropertyName == wxT("PREF")){
+			
+			int PriorityNumber = 0;
+			bool ValidNumber = TRUE;
+			
+			try{
+				PriorityNumber = std::stoi(PropertyValue.ToStdString());
+			}
+			
+			catch(std::invalid_argument &e){
+				ValidNumber = FALSE;
+			}
+
+			if (ValidNumber == TRUE){
+
+				EmailListPref->erase(*EmailCount);
+				EmailListPref->insert(std::make_pair(*EmailCount, PriorityNumber));
+
+			}
+		
+		} else {
+		
+			if (!PropertyName.IsEmpty() && !PropertyValue.IsEmpty() && PropertyName != wxT("TYPE")){
+			
+				if (FirstToken == TRUE){
+				
+					PropertyTokens.Append(PropertyName + wxT("=") + PropertyValue);
+					FirstToken = FALSE;
+				
+				} else {
+				
+					PropertyTokens.Append(wxT(";") + PropertyName + wxT("=") + PropertyValue);
+				
+				}
+			
+			}
+		
+		}
+	
+	}
+	
+	EmailList->insert(std::make_pair(*EmailCount, PropertySeg2));
+	
+	// Add the name token data.
+	
+	if (!PropertyTokens.IsEmpty()){
+	
+		EmailListTokens->insert(std::make_pair(*EmailCount, PropertyTokens));
+	
+	}	
+
+
+}
+
+void ContactDataObject::ProcessIM(wxString PropertySeg1, wxString PropertySeg2, int *IMCount){
+
+	std::map<int, int> SplitPoints;
+	std::map<int, int> SplitLength;
+
+	int intPrevValue = 6;
+	int intPref = 0;			
+	
+	SplitValues(&PropertySeg1, &SplitPoints, &SplitLength, intPrevValue);
+	
+	intPrevValue = 5;
+	
+	PropertyType PropType = PROPERTY_NONE;
+		
+	// Look for type before continuing.
+	
+	CheckType(&PropertySeg1, &SplitPoints, &SplitLength, &intPrevValue, &PropType);
+	
+	std::map<int, wxString> *IMList = NULL;
+	std::map<int, wxString> *IMListType = NULL;
+	std::map<int, wxString> *IMListAltID = NULL;
+	std::map<int, wxString> *IMListPID = NULL;
+	std::map<int, wxString> *IMListTokens = NULL;
+	std::map<int, wxString> *IMListMediatype = NULL;	
+	std::map<int, int> *IMListPref = NULL;
+
+	switch(PropType){
+		case PROPERTY_NONE:
+			IMList = &GeneralIMList;
+			IMListType = &GeneralIMListType;
+			IMListAltID = &GeneralIMListAltID;
+			IMListPID = &GeneralIMListPID;
+			IMListTokens = &GeneralIMListTokens;
+			IMListMediatype = &GeneralIMListMediatype;
+			IMListPref = &GeneralIMListPref;	
+			break;
+		case PROPERTY_HOME:
+			IMList = &HomeIMList;
+			IMListType = &HomeIMListType;
+			IMListAltID = &HomeIMListAltID;
+			IMListPID = &HomeIMListPID;
+			IMListTokens = &HomeIMListTokens;
+			IMListMediatype = &HomeIMListMediatype;		
+			IMListPref = &HomeIMListPref;	
+			break;
+		case PROPERTY_WORK:
+			IMList = &BusinessIMList;
+			IMListType = &BusinessIMListType;
+			IMListAltID = &BusinessIMListAltID;
+			IMListPID = &BusinessIMListPID;
+			IMListTokens = &BusinessIMListTokens;	
+			IMListMediatype = &BusinessIMListMediatype;	
+			IMListPref = &BusinessIMListPref;	
+			break;
+	}
+	
+	intPrevValue = 5;
+	
+	std::map<int,int>::iterator SLiter;
+	wxString PropertyData;
+	wxString PropertyName;
+	wxString PropertyValue;
+	wxString PropertyTokens;
+	bool FirstToken = TRUE;
+	
+	for (std::map<int, int>::iterator intiter = SplitPoints.begin(); 
+	intiter != SplitPoints.end(); ++intiter){
+	
+		SLiter = SplitLength.find(intiter->first);
+	
+		PropertyData = PropertySeg1.Mid(intPrevValue, (SLiter->second));
+		
+		wxStringTokenizer PropertyElement (PropertyData, wxT("="));
+		PropertyName = PropertyElement.GetNextToken();				
+		PropertyValue = PropertyElement.GetNextToken();
+		
+		intPrevValue = intiter->second;
+		
+		CaptureString(&PropertyValue, FALSE);
+		
+		// Process properties.
+		
+		if (PropertyName == wxT("ALTID")){
+
+			IMListAltID->erase(*IMCount);
+			IMListAltID->insert(std::make_pair(*IMCount, PropertyValue));
+		
+		} else if (PropertyName == wxT("PID")){
+
+			IMListPID->erase(*IMCount);
+			IMListPID->insert(std::make_pair(*IMCount, PropertyValue));
+		
+		} else if (PropertyName == wxT("MEDIATYPE")){
+
+			IMListMediatype->erase(*IMCount);
+			IMListMediatype->insert(std::make_pair(*IMCount, PropertyValue));
+		
+		} else if (PropertyName == wxT("PREF")){
+			
+			int PriorityNumber = 0;
+			bool ValidNumber = TRUE;
+			
+			try{
+				PriorityNumber = std::stoi(PropertyValue.ToStdString());
+			}
+			
+			catch(std::invalid_argument &e){
+				ValidNumber = FALSE;
+			}
+
+			if (ValidNumber == TRUE){
+
+				IMListPref->erase(*IMCount);
+				IMListPref->insert(std::make_pair(*IMCount, PriorityNumber));
+
+			}
+		
+		} else {
+		
+			if (!PropertyName.IsEmpty() && !PropertyValue.IsEmpty() && PropertyName != wxT("TYPE")){
+			
+				if (FirstToken == TRUE){
+				
+					PropertyTokens.Append(PropertyName + wxT("=") + PropertyValue);
+					FirstToken = FALSE;
+				
+				} else {
+				
+					PropertyTokens.Append(wxT(";") + PropertyName + wxT("=") + PropertyValue);
+				
+				}
+			
+			}
+		
+		}
+	
+	}
+		
+	IMList->insert(std::make_pair(*IMCount, PropertySeg2));
+	
+	// Add the name token data.
+	
+	if (!PropertyTokens.IsEmpty()){
+	
+		IMListTokens->insert(std::make_pair(*IMCount, PropertyTokens));
+	
+	}	
+
+}
+
+void ContactDataObject::ProcessTelephone(wxString PropertySeg1, wxString PropertySeg2, int *TelephoneCount){
+
+	std::map<int, int> SplitPoints;
+	std::map<int, int> SplitLength;
+	std::map<int, int>::iterator SLiter;
+	
+	int intPref = 0;
+	
+	PropertyType PropType = PROPERTY_NONE;
+		
+	// Look for type before continuing.
+	
+	wxString TelTypeUI;
+	wxString TelTypeDetail;
+	wxString PropertyData;
+	wxString PropertyName;
+	wxString PropertyValue;
+	wxString PropertyTokens;
+	
+	std::map<int,int> TypeSplitPoints;
+	std::map<int,int> TypeSplitLength;
+	std::map<int,int>::iterator TSLiter;
+	
+	int intSplitSize = 0;
+	int intSplitsFound = 0;
+	int intSplitPoint = 0;
+	int intType = 0;
+	int intPrevValue = 5;
+		
+	SplitValues(&PropertySeg1, &SplitPoints, &SplitLength, intPrevValue);
+	
+	intPrevValue = 4;
+	
+	// Look for type before continuing.
+	
+	for (std::map<int, int>::iterator intiter = SplitPoints.begin(); 
+	intiter != SplitPoints.end(); ++intiter){
+	
+		SLiter = SplitLength.find(intiter->first);
+	
+		PropertyData = PropertySeg1.Mid(intPrevValue, (SLiter->second));
+		
+		wxStringTokenizer PropertyElement (PropertyData, wxT("="));
+		PropertyName = PropertyElement.GetNextToken();				
+		PropertyValue = PropertyElement.GetNextToken();
+		
+		intPrevValue = intiter->second;
+
+		if (PropertyName == wxT("TYPE")){
+		
+			// Process each value in type and translate each
+			// part.
+		
+			// Strip out the quotes if they are there.
+		
+			size_t intPropertyValueLen = PropertyValue.Len();
+		
+			if (PropertyValue.Mid((intPropertyValueLen - 1), 1) == wxT("\"")){
+			
+				PropertyValue.Trim();
+				PropertyValue.RemoveLast();
+			
+			}				
+		
+			if (PropertyValue.Mid(0, 1) == wxT("\"")){
+			
+				PropertyValue.Remove(0, 1);
+			
+			}
+			
+			TelTypeDetail = PropertyValue;
+			
+			intSplitSize = 0;
+			intSplitsFound = 0;
+			intSplitPoint = 0;
+			
+			for (int i = 0; i <= intPropertyValueLen; i++){
+	
+				intSplitSize++;
+	
+				if (PropertyValue.Mid(i, 1) == wxT(",") && PropertyValue.Mid((i - 1), 1) != wxT("\\")){
+	
+					if (intSplitsFound == 0){
+
+						TypeSplitPoints.insert(std::make_pair(intSplitsFound, intSplitPoint));
+						TypeSplitLength.insert(std::make_pair(intSplitsFound, (intSplitSize - 1)));
+			
+					} else {
+			
+						TypeSplitPoints.insert(std::make_pair(intSplitsFound, intSplitPoint));
+						TypeSplitLength.insert(std::make_pair(intSplitsFound, intSplitSize));
+			
+					}			
+
+					intSplitsFound++;
+					i++;
+					intSplitPoint = i;
+					intSplitSize = 0;
+	
+				}
+	
+			}
+			
+			TypeSplitPoints.insert(std::make_pair(intSplitsFound, intSplitPoint));
+			TypeSplitLength.insert(std::make_pair(intSplitsFound, intSplitSize));								
+		
+			int intTypeSeek = 0;
+		
+			for (std::map<int, int>::iterator typeiter = TypeSplitPoints.begin(); 
+			typeiter != TypeSplitPoints.end(); ++typeiter){
+			
+				wxString TypePropertyName;
+				
+				TSLiter = TypeSplitLength.find(typeiter->first);
+				
+				TypePropertyName = PropertyValue.Mid(typeiter->second, TSLiter->second);
+				
+				if (intTypeSeek == 0){
+				
+				
+				} else {
+										
+					TelTypeUI.Append(wxT(","));							
+				
+				}
+			
+				if (TypePropertyName == wxT("home")){
+				
+					PropType = PROPERTY_HOME;
+				
+				} else if (TypePropertyName == wxT("work")){
+				
+					PropType = PROPERTY_WORK;
+									
+				}
+				
+				
+				if (TypePropertyName == wxT("text")){
+				
+					TelTypeUI.Append(_("text"));
+					intTypeSeek++;
+				
+				} else if (TypePropertyName == wxT("voice")){
+				
+					TelTypeUI.Append(_("voice"));
+					intTypeSeek++;
+				
+				} else if (TypePropertyName == wxT("fax")){
+				
+					TelTypeUI.Append(_("fax"));
+					intTypeSeek++;
+				
+				} else if (TypePropertyName == wxT("cell")){
+				
+					TelTypeUI.Append(_("mobile"));
+					intTypeSeek++;
+				
+				} else if (TypePropertyName == wxT("video")){
+				
+					TelTypeUI.Append(_("video"));
+					intTypeSeek++;
+				
+				} else if (TypePropertyName == wxT("pager")){
+				
+					TelTypeUI.Append(_("pager"));
+					intTypeSeek++;
+				
+				} else if (TypePropertyName == wxT("textphone")){
+				
+					TelTypeUI.Append(_("textphone"));
+					intTypeSeek++;
+				
+				}
+			
+			}
+		
+		}
+		
+	}
+	
+	std::map<int, wxString> *TelephoneList = NULL;
+	std::map<int, wxString> *TelephoneListType = NULL;
+	std::map<int, wxString> *TelephoneListAltID = NULL;
+	std::map<int, wxString> *TelephoneListPID = NULL;
+	std::map<int, wxString> *TelephoneListTokens = NULL;
+	std::map<int, wxString> *TelephoneListTypeInfo = NULL;	
+	std::map<int, int> *TelephoneListPref = NULL;
+
+	switch(PropType){
+		case PROPERTY_NONE:
+			TelephoneList = &GeneralTelephoneList;
+			TelephoneListType = &GeneralTelephoneListType;
+			TelephoneListAltID = &GeneralTelephoneListAltID;
+			TelephoneListPID = &GeneralTelephoneListPID;
+			TelephoneListTokens = &GeneralTelephoneListTokens;
+			TelephoneListTypeInfo = &GeneralTelephoneListTypeInfo;
+			TelephoneListPref = &GeneralTelephoneListPref;	
+			break;
+		case PROPERTY_HOME:
+			TelephoneList = &HomeTelephoneList;
+			TelephoneListType = &HomeTelephoneListType;
+			TelephoneListAltID = &HomeTelephoneListAltID;
+			TelephoneListPID = &HomeTelephoneListPID;
+			TelephoneListTokens = &HomeTelephoneListTokens;
+			TelephoneListTypeInfo = &HomeTelephoneListTypeInfo;	
+			TelephoneListPref = &HomeTelephoneListPref;	
+			break;
+		case PROPERTY_WORK:
+			TelephoneList = &BusinessTelephoneList;
+			TelephoneListType = &BusinessTelephoneListType;
+			TelephoneListAltID = &BusinessTelephoneListAltID;
+			TelephoneListPID = &BusinessTelephoneListPID;
+			TelephoneListTokens = &BusinessTelephoneListTokens;	
+			TelephoneListTypeInfo = &BusinessTelephoneListTypeInfo;	
+			TelephoneListPref = &BusinessTelephoneListPref;	
+			break;
+	}
+		
+	// Process the properties.
+	
+	bool FirstToken = TRUE;
+	
+	intPrevValue = 5;
+	SplitPoints.clear();
+	SplitLength.clear();
+
+	SplitValues(&PropertySeg1, &SplitPoints, &SplitLength, intPrevValue);
+
+	intPrevValue = 4;
+	
+	for (std::map<int, int>::iterator intiter = SplitPoints.begin(); 
+	intiter != SplitPoints.end(); ++intiter){
+	
+		SLiter = SplitLength.find(intiter->first);
+	
+		PropertyData = PropertySeg1.Mid(intPrevValue, (SLiter->second));
+		
+		wxStringTokenizer PropertyElement (PropertyData, wxT("="));
+		PropertyName = PropertyElement.GetNextToken();				
+		PropertyValue = PropertyElement.GetNextToken();
+		
+		intPrevValue = intiter->second;
+		
+		CaptureString(&PropertyValue, FALSE);
+		
+		// Process properties.
+		
+		if (PropertyName == wxT("ALTID")){
+
+			TelephoneListAltID->erase(*TelephoneCount);
+			TelephoneListAltID->insert(std::make_pair(*TelephoneCount, PropertyValue));
+		
+		} else if (PropertyName == wxT("PID")){
+
+			TelephoneListPID->erase(*TelephoneCount);
+			TelephoneListPID->insert(std::make_pair(*TelephoneCount, PropertyValue));
+		
+		} else if (PropertyName == wxT("PREF")){
+			
+			int PriorityNumber = 0;
+			bool ValidNumber = TRUE;
+			
+			try{
+				PriorityNumber = std::stoi(PropertyValue.ToStdString());
+			}
+			
+			catch(std::invalid_argument &e){
+				ValidNumber = FALSE;
+			}
+
+			if (ValidNumber == TRUE){
+
+				TelephoneListPref->erase(*TelephoneCount);
+				TelephoneListPref->insert(std::make_pair(*TelephoneCount, PriorityNumber));
+
+			}
+		
+		} else {
+		
+			if (!PropertyName.IsEmpty() && !PropertyValue.IsEmpty() && PropertyName != wxT("TYPE")){
+			
+				if (FirstToken == TRUE){
+				
+					PropertyTokens.Append(PropertyName + wxT("=") + PropertyValue);
+					FirstToken = FALSE;
+				
+				} else {
+				
+					PropertyTokens.Append(wxT(";") + PropertyName + wxT("=") + PropertyValue);
+				
+				}
+			
+			}
+		
+		}
+	
+	}
+		
+	TelephoneList->insert(std::make_pair(*TelephoneCount, PropertySeg2));
+	TelephoneListTypeInfo->insert(std::make_pair(*TelephoneCount, TelTypeUI));
+	
+	// Add the name token data.
+	
+	if (!PropertyTokens.IsEmpty()){
+	
+		TelephoneListTokens->insert(std::make_pair(*TelephoneCount, PropertyTokens));
+	
+	}
+
+}
+
 void SplitValues(wxString *PropertyLine, 
 	std::map<int,int> *SplitPoints, 
 	std::map<int,int> *SplitLength,