X-Git-Url: http://Server1/repobrowser/?a=blobdiff_plain;f=source%2Fcontacteditor%2FContactDataObject.cpp;h=23c53f3999116a01fe7332b5962439067289d744;hb=0a749c36a873e196f41a5f8c7da3f09592bf24fb;hp=8bddc03502a2df0346e24d0fca082066c23871f8;hpb=a58dd7db86483b23e28922872fac544b5b73b79c;p=xestiaab%2F.git

diff --git a/source/contacteditor/ContactDataObject.cpp b/source/contacteditor/ContactDataObject.cpp
index 8bddc03..23c53f3 100644
--- a/source/contacteditor/ContactDataObject.cpp
+++ b/source/contacteditor/ContactDataObject.cpp
@@ -78,8 +78,11 @@ ContactLoadStatus ContactDataObject::LoadFile(wxString Filename){
 	bool GenderProcessed = FALSE;
 	bool BirthdayProcessed = FALSE;
 	bool AnniversaryProcessed = FALSE;
+	bool UIDProcessed = FALSE;
+	bool RevisionProcessed = FALSE;
 	int ContactLineLen = 0;
 	int QuoteBreakPoint = 0;
+	int SourceCount = 0;
 	int GroupCount = 0;
 	int FNCount = 0;
 	int NicknameCount = 0;
@@ -103,6 +106,11 @@ ContactLoadStatus ContactDataObject::LoadFile(wxString Filename){
 	int CalendarCount = 0;
 	int CalendarAddressCount = 0;
 	int FreeBusyAddressCount = 0;
+	int KeyCount = 0;
+	int VendorCount = 0;
+	int XTokenCount = 0;
+	int XMLCount = 0;
+	int ClientPIDCount = 0;
 	wxString ContactLine;
 	wxString PropertyLine;
 	wxString PropertySeg1;
@@ -205,6 +213,26 @@ ContactLoadStatus ContactDataObject::LoadFile(wxString Filename){
 				
 			ProcessKind(PropertySeg2);
 		
+		} else if (Property == wxT("UID") && UIDProcessed == FALSE){
+		
+			UIDToken = PropertySeg2;
+			UIDProcessed = TRUE;
+		
+		} else if (Property == wxT("SOURCE")){
+		
+			ProcessSource(PropertySeg1, PropertySeg2, &SourceCount);
+			SourceCount++;
+		
+		} else if (Property == wxT("XML")){
+		
+			ProcessXML(PropertySeg1, PropertySeg2, &XMLCount);
+			XMLCount++;
+		
+		} else if (Property == wxT("REV") && RevisionProcessed == FALSE){
+		
+			ProcessRevision(PropertySeg1, PropertySeg2);
+			RevisionProcessed = TRUE;
+		
 		} else if (Property == wxT("MEMBER")){
 
 			ProcessMember(PropertySeg1, PropertySeg2, &GroupCount);
@@ -220,6 +248,11 @@ ContactLoadStatus ContactDataObject::LoadFile(wxString Filename){
 			ProcessN(PropertySeg1, PropertySeg2);
 			NameProcessed = TRUE;
 		
+		} else if (Property == wxT("CLIENTPIDMAP")){
+		
+			ProcessClientPIDMap(PropertySeg1, PropertySeg2, &ClientPIDCount);
+			ClientPIDCount++;
+		
 		} else if (Property == wxT("NICKNAME")){
 						
 			ProcessNickname(PropertySeg1, PropertySeg2, &NicknameCount);
@@ -375,6 +408,24 @@ ContactLoadStatus ContactDataObject::LoadFile(wxString Filename){
 			ProcessCalendarFreeBusy(PropertySeg1, PropertySeg2, &FreeBusyAddressCount);
 			FreeBusyAddressCount++;
 
+		} else if (Property == wxT("KEY")){
+		
+			// See frmContactEditor-LoadKey.cpp
+			
+			ProcessKey(PropertySeg1, PropertySeg2, &KeyCount);
+			KeyCount++;
+		
+		} else if (Property.Mid(0, 3) == wxT("VND")){
+		
+			ProcessVendor(PropertySeg1, PropertySeg2, &VendorCount);
+			VendorCount++;
+		
+		} else if (Property.Mid(0, 2) == wxT("X-")){
+			
+			XTokenList.insert(std::make_pair(XTokenCount, PropertySeg2));
+			XTokenListTokens.insert(std::make_pair(XTokenCount, PropertySeg1.Mid(2)));
+			XTokenCount++;
+		
 		}
 		
 	}
@@ -408,6 +459,269 @@ void ContactDataObject::ProcessKind(wxString KindType){
 
 }
 
+void ContactDataObject::ProcessRevision(wxString PropertySeg1, wxString PropertySeg2){
+
+	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;
+	bool FirstToken = TRUE;
+	int intSplitsFound = 0;
+	int intSplitSize = 0;
+	int intPrevValue = 5;
+	int intPref = 0;			
+	int intType = 0;
+	
+	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;
+		
+		// Process properties.
+		
+		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);
+			
+		}			
+		
+		CaptureString(&PropertyValue, FALSE);
+								
+		if (FirstToken == TRUE){
+				
+			PropertyTokens.Append(PropertyName + wxT("=") + PropertyValue);
+			FirstToken = FALSE;
+				
+		} else {
+				
+			PropertyTokens.Append(wxT(";") + PropertyName + wxT("=") + PropertyValue);
+				
+		}
+	
+	}	
+	
+	CaptureString(&PropertySeg2, FALSE);
+	
+	Revision = PropertySeg2;
+	
+	if (!PropertyTokens.IsEmpty()){
+	
+		RevisionTokens = PropertyTokens;
+	
+	}
+
+
+}
+
+void ContactDataObject::ProcessSource(wxString PropertySeg1, wxString PropertySeg2, int *SourceCount){
+
+	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;
+	bool FirstToken = TRUE;
+	int intSplitsFound = 0;
+	int intSplitSize = 0;
+	int intPrevValue = 8;
+	int intPref = 0;			
+	int intType = 0;
+	
+	SplitValues(&PropertySeg1, &SplitPoints, &SplitLength, intPrevValue);
+	
+	intPrevValue = 7;
+	
+	PropertyType PropType = PROPERTY_NONE;
+	
+	// Look for type before continuing.			
+
+	CheckType(&PropertySeg1, &SplitPoints, &SplitLength, &intPrevValue, &PropType);
+
+	intPrevValue = 7;
+
+	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;
+		
+		// Process properties.
+		
+		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);
+			
+		}			
+		
+		CaptureString(&PropertyValue, FALSE);
+		
+		if (PropertyName == wxT("ALTID")){
+
+			SourceListAltID.erase(*SourceCount);
+			SourceListAltID.insert(std::make_pair(*SourceCount, PropertyValue));
+		
+		} else if (PropertyName == wxT("PID")){
+
+			SourceListPID.erase(*SourceCount);
+			SourceListPID.insert(std::make_pair(*SourceCount, PropertyValue));
+		
+		} else if (PropertyName == wxT("PREF")){
+			
+			ProcessIntegerValue(this, &SourceListPref, &PropertyValue, SourceCount);
+
+		} else if (PropertyName == wxT("MEDIATYPE")){
+		
+			SourceListMediatype.erase(*SourceCount);
+			SourceListMediatype.insert(std::make_pair(*SourceCount, PropertyValue));
+
+		} else {
+		
+			// Something else we don't know about so append
+			// to the tokens variable.
+			
+			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);
+				
+				}
+			
+			}
+		
+		}
+	
+	}	
+	
+	intPropertyLen = PropertySeg2.Len();
+	SplitPoints.clear();
+	SplitLength.clear();
+	intSplitsFound = 0;
+	intSplitSize = 0;
+	intPrevValue = 0;
+	
+	CaptureString(&PropertySeg2, FALSE);
+	
+	// Add the data to the General/Home/Work address variables.
+		
+	switch(PropType){
+		case PROPERTY_NONE:
+			break;
+		case PROPERTY_HOME:
+			SourceListType.insert(std::make_pair(*SourceCount, "home"));
+			break;
+		case PROPERTY_WORK:
+			SourceListType.insert(std::make_pair(*SourceCount, "work"));
+			break;
+	}
+	
+	SourceList.insert(std::make_pair(*SourceCount, PropertySeg2));
+	
+	if (!PropertyTokens.IsEmpty()){
+	
+		SourceListTokens.insert(std::make_pair(*SourceCount, PropertyTokens));
+	
+	}
+
+}
+
+void ContactDataObject::ProcessXML(wxString PropertySeg1, wxString PropertySeg2, int *XMLCount){
+
+	std::map<int, int> SplitPoints;
+	std::map<int, int> SplitLength;
+
+	int intPrevValue = 5;
+	int intPref = 0;			
+	int intType = 0;
+	
+	SplitValues(&PropertySeg1, &SplitPoints, &SplitLength, intPrevValue);
+
+	intPrevValue = 4;
+	
+	wxString PropertyName;
+	wxString PropertyValue;
+	wxString PropertyData;
+	wxString PropertyTokens;
+	std::map<int,int>::iterator SLiter;
+	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);
+	
+		if (PropertyName == wxT("ALTID")){
+
+			XMLListAltID.erase(*XMLCount);
+			XMLListAltID.insert(std::make_pair(*XMLCount, PropertyValue));
+		
+		}
+		
+	}
+
+	XMLList.insert(std::make_pair(*XMLCount, PropertySeg2));
+
+}
+
 void ContactDataObject::ProcessMember(wxString PropertySeg1, wxString PropertySeg2, int *GroupCount){
 
 	std::map<int, int> SplitPoints;
@@ -455,23 +769,7 @@ void ContactDataObject::ProcessMember(wxString PropertySeg1, wxString PropertySe
 		
 		} 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){
-
-				GroupsListPref.erase(*GroupCount);
-				GroupsListPref.insert(std::make_pair(*GroupCount, PriorityNumber));
-		
-			}
+			ProcessIntegerValue(this, &GroupsListPref, &PropertyValue, GroupCount);
 		
 		} else if (PropertyName == wxT("MEDIATYPE")){
 
@@ -568,23 +866,7 @@ void ContactDataObject::ProcessFN(wxString PropertySeg1, wxString PropertySeg2,
 		
 		} 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){
-
-				FullNamesListPref.erase(*FNCount);
-				FullNamesListPref.insert(std::make_pair(*FNCount, PriorityNumber));
-
-			}
+			ProcessIntegerValue(this, &FullNamesListPref, &PropertyValue, FNCount);
 		
 		} else if (!PropertyName.IsEmpty() && !PropertyValue.IsEmpty()){
 			
@@ -768,6 +1050,90 @@ void ContactDataObject::ProcessN(wxString PropertySeg1, wxString PropertySeg2){
 
 }
 
+void ContactDataObject::ProcessClientPIDMap(wxString PropertySeg1, wxString PropertySeg2, int *ClientPIDCount){
+
+	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;
+	bool FirstToken = TRUE;
+	int intSplitsFound = 0;
+	int intSplitSize = 0;
+	int intPrevValue = 14;
+	int intPref = 0;			
+	int intType = 0;
+	
+	SplitValues(&PropertySeg1, &SplitPoints, &SplitLength, intPrevValue);
+	
+	intPrevValue = 13;
+
+	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;
+		
+		// Process properties.
+		
+		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);
+			
+		}			
+		
+		CaptureString(&PropertyValue, FALSE);
+		
+		if (PropertyName.IsEmpty() || PropertyName.IsEmpty()){
+		
+			continue;
+		
+		}
+							
+		if (FirstToken == TRUE){
+				
+			PropertyTokens.Append(PropertyName + wxT("=") + PropertyValue);
+			FirstToken = FALSE;
+				
+		} else {
+				
+			PropertyTokens.Append(wxT(";") + PropertyName + wxT("=") + PropertyValue);
+				
+		}
+	
+	}	
+	
+	CaptureString(&PropertySeg2, FALSE);
+	
+	ClientPIDList.insert(std::make_pair(*ClientPIDCount, PropertySeg2));
+	
+	if (!PropertyTokens.IsEmpty()){
+	
+		ClientPIDListTokens.insert(std::make_pair(*ClientPIDCount, PropertyTokens));
+	
+	}
+
+}
+
 void ContactDataObject::ProcessNickname(wxString PropertySeg1, wxString PropertySeg2, int *NicknameCount){
 
 	std::map<int, int> SplitPoints;
@@ -860,23 +1226,7 @@ void ContactDataObject::ProcessNickname(wxString PropertySeg1, wxString Property
 
 		} 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){
-
-				NicknamesListPref->erase(*NicknameCount);
-				NicknamesListPref->insert(std::make_pair(*NicknameCount, PriorityNumber));
-
-			}
+			ProcessIntegerValue(this, NicknamesListPref, &PropertyValue, NicknameCount);
 		
 		} else if (PropertyName == wxT("LANGUAGE")){
 
@@ -1351,23 +1701,7 @@ void ContactDataObject::ProcessTimeZone(wxString PropertySeg1, wxString Property
 
 		} 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){
-
-				TZListPref->erase(*TimeZoneCount);
-				TZListPref->insert(std::make_pair(*TimeZoneCount, PriorityNumber));
-
-			}
+			ProcessIntegerValue(this, TZListPref, &PropertyValue, TimeZoneCount);
 		
 		} else if (PropertyName == wxT("MEDIATYPE")){
 
@@ -1576,31 +1910,15 @@ void ContactDataObject::ProcessAddress(wxString PropertySeg1, wxString PropertyS
 
 			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){
+		
+		} else if (PropertyName == wxT("MEDIATYPE")){
 
-				AddressListPref->erase(*AddressCount);
-				AddressListPref->insert(std::make_pair(*AddressCount, PriorityNumber));
+			AddressListMediatype->erase(*AddressCount);
+			AddressListMediatype->insert(std::make_pair(*AddressCount, PropertyValue));
+		
+		} else if (PropertyName == wxT("PREF")){
 
-			}
+			ProcessIntegerValue(this, AddressListPref, &PropertyValue, AddressCount);
 		
 		} else {
 		
@@ -1865,23 +2183,7 @@ void ContactDataObject::ProcessEmail(wxString PropertySeg1, wxString PropertySeg
 		
 		} 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));
-
-			}
+			ProcessIntegerValue(this, EmailListPref, &PropertyValue, EmailCount);
 		
 		} else {
 		
@@ -2016,23 +2318,7 @@ void ContactDataObject::ProcessIM(wxString PropertySeg1, wxString PropertySeg2,
 		
 		} 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));
-
-			}
+			ProcessIntegerValue(this, IMListPref, &PropertyValue, IMCount);
 		
 		} else {
 		
@@ -5201,6 +5487,293 @@ void ContactDataObject::ProcessCalendarFreeBusy(wxString PropertySeg1, wxString
 
 }
 
+void ContactDataObject::ProcessKey(wxString PropertySeg1, wxString PropertySeg2, int *KeyCount){
+
+	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;
+	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;
+
+	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;
+		
+		// Process properties.
+		
+		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);
+			
+		}				
+		
+		if (PropertyName == wxT("ALTID")){
+
+			KeyListAltID.erase(*KeyCount);
+			KeyListAltID.insert(std::make_pair(*KeyCount, PropertyValue));
+		
+		} else if (PropertyName == wxT("PID")){
+
+			KeyListPID.erase(*KeyCount);
+			KeyListPID.insert(std::make_pair(*KeyCount, 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){
+
+				KeyListPref.erase(*KeyCount);
+				KeyListPref.insert(std::make_pair(*KeyCount, PriorityNumber));
+
+			}
+		
+		} else {
+		
+			// Something else we don't know about so append
+			// to the tokens variable.
+			
+			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);
+				
+				}
+			
+			}
+		
+		}
+	
+	}				
+	
+	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;					
+	
+		}
+
+	}
+	
+	wxString wxSKeyURI;
+	wxString wxSKeyMIME;
+	wxString wxSKeyEncoding;
+	wxString wxSKeyData;
+	std::string base64enc;
+	
+	if (intSplitsFound == 0){
+	
+	} else {
+	
+		std::map<int, int>::iterator striter;
+	
+		striter = SplitLength.find(1);
+	
+		wxStringTokenizer wSTDataType(PropertySeg2.Mid(0, striter->second), wxT(":"));
+	
+		while (wSTDataType.HasMoreTokens() == TRUE){
+		
+			wxSKeyURI = wSTDataType.GetNextToken();
+			wxSKeyMIME = wSTDataType.GetNextToken();
+			break;
+		
+		}			
+	
+		if (wxSKeyURI == wxT("data")){
+		
+				wxStringTokenizer wSTDataInfo(PropertySeg2.Mid((striter->second + 1)), wxT(","));			
+ 	
+				while (wSTDataInfo.HasMoreTokens() == TRUE){
+		
+				wxSKeyEncoding = wSTDataInfo.GetNextToken();
+				wxSKeyData = wSTDataInfo.GetNextToken();
+				break;
+		
+			}
+		
+		}
+	
+	}
+	
+	// Add the data to the General/Home/Work address variables.
+	
+	if (wxSKeyURI == wxT("data")){
+		
+		KeyListDataEncType.erase(*KeyCount);
+		KeyListKeyType.erase(*KeyCount);
+		KeyListDataEncType.insert(std::make_pair(*KeyCount, wxSKeyEncoding));
+		KeyListKeyType.insert(std::make_pair(*KeyCount, TRUE));
+		
+		KeyList.erase(*KeyCount);
+		KeyList.insert(std::make_pair(*KeyCount, wxSKeyData));
+	
+	} else {
+		
+		KeyList.erase(*KeyCount);
+		KeyList.insert(std::make_pair(*KeyCount, PropertySeg2));
+	
+	}
+	
+	KeyListDataType.insert(std::make_pair(*KeyCount, wxSKeyMIME));
+		
+	switch (PropType){
+		case PROPERTY_NONE:
+			break;
+		case PROPERTY_HOME: 
+			KeyListType.insert(std::make_pair(*KeyCount, wxT("home")));
+			break;
+		case PROPERTY_WORK: 
+			KeyListType.insert(std::make_pair(*KeyCount, wxT("work")));
+			break;
+	}
+
+	if (!PropertyTokens.IsEmpty()){
+
+		KeyListTokens.insert(std::make_pair(*KeyCount, PropertyTokens));
+
+	}
+
+}
+
+void ContactDataObject::ProcessVendor(wxString PropertySeg1, wxString PropertySeg2, int *VendorCount){
+
+	// Split the Vendor three ways.
+	
+	wxStringTokenizer wSTVendorDetails(PropertySeg1, wxT("-"));
+	
+	wxString wxSVNDID;
+	wxString wxSVNDPropName;
+	long ListCtrlIndex;			
+
+	while (wSTVendorDetails.HasMoreTokens() == TRUE){
+	
+		wSTVendorDetails.GetNextToken();
+		wxSVNDID = wSTVendorDetails.GetNextToken();
+		wxSVNDPropName = wSTVendorDetails.GetNextToken();
+		break;
+	
+	}
+	
+	if (!wxSVNDID.IsEmpty() && !wxSVNDPropName.IsEmpty()){
+	
+		// Add the data to the vendor variables.
+	
+		VendorList.erase(*VendorCount);
+		VendorListPEN.erase(*VendorCount);
+		VendorListElement.erase(*VendorCount);
+	
+		VendorList.insert(std::make_pair(*VendorCount, PropertySeg2));
+		VendorListPEN.insert(std::make_pair(*VendorCount, wxSVNDID));
+		VendorListElement.insert(std::make_pair(*VendorCount, wxSVNDPropName));
+	
+	}
+
+}
+
+void ProcessIntegerValue(ContactDataObject *ContactData,
+	std::map<int,int> *PrefPtr, 
+	wxString *PropertyValue, 
+	int *ItemCount){
+
+	int PriorityNumber = 0;	
+	bool ValidNumber = TRUE;
+			
+	try{
+		PriorityNumber = std::stoi(PropertyValue->ToStdString());
+	}
+			
+	catch(std::invalid_argument &e){
+		ValidNumber = FALSE;
+	}
+
+	if (ValidNumber == TRUE){
+
+		PrefPtr->erase(*ItemCount);
+		PrefPtr->insert(std::make_pair(*ItemCount, PriorityNumber));
+
+	}
+
+}
+
 void SplitValues(wxString *PropertyLine, 
 	std::map<int,int> *SplitPoints, 
 	std::map<int,int> *SplitLength,