X-Git-Url: http://Server1/repobrowser/?a=blobdiff_plain;f=source%2Fcontacteditor%2FContactDataObject.cpp;h=44a361d3b1da291de934629cc0273e1d158bcac1;hb=cccf4ec6bbbc80aaf383dbe9b88fc91671bdbaf5;hp=1acc7f9626090b2d6795b2fb196df2eb5eb7763e;hpb=61ae72f92285e9b558927e2f64403a243a3290b4;p=xestiaab%2F.git

diff --git a/source/contacteditor/ContactDataObject.cpp b/source/contacteditor/ContactDataObject.cpp
index 1acc7f9..44a361d 100644
--- a/source/contacteditor/ContactDataObject.cpp
+++ b/source/contacteditor/ContactDataObject.cpp
@@ -511,17 +511,8 @@ void ContactDataObject::ProcessRevision(wxString PropertySeg1, wxString Property
 		}			
 		
 		CaptureString(&PropertyValue, FALSE);
-								
-		if (FirstToken == TRUE){
-				
-			PropertyTokens.Append(PropertyName + wxT("=") + PropertyValue);
-			FirstToken = FALSE;
-				
-		} else {
-				
-			PropertyTokens.Append(wxT(";") + PropertyName + wxT("=") + PropertyValue);
-				
-		}
+		
+		ProcessTokens(&PropertyName, &PropertyValue, &PropertyTokens, &FirstToken);
 	
 	}	
 	
@@ -549,6 +540,7 @@ void ContactDataObject::ProcessSource(wxString PropertySeg1, wxString PropertySe
 	wxString PropertyValue;
 	wxString PropertyTokens;
 	bool FirstToken = TRUE;
+	bool PropertyMatched = FALSE;
 	int intSplitsFound = 0;
 	int intSplitSize = 0;
 	int intPrevValue = 8;
@@ -599,42 +591,28 @@ void ContactDataObject::ProcessSource(wxString PropertySeg1, wxString PropertySe
 		
 		CaptureString(&PropertyValue, FALSE);
 		
-		if (PropertyName == wxT("ALTID")){
-
-			SourceListAltID.erase(*SourceCount);
-			SourceListAltID.insert(std::make_pair(*SourceCount, PropertyValue));
+		ProcessStringValue(&PropertyName, "ALTID", &SourceListAltID, &PropertyValue, SourceCount, &PropertyMatched);
+		ProcessStringValue(&PropertyName, "PID", &SourceListPID, &PropertyValue, SourceCount, &PropertyMatched);
+		ProcessStringValue(&PropertyName, "MEDIATYPE", &SourceListMediatype, &PropertyValue, SourceCount, &PropertyMatched);
+		ProcessIntegerValue(&PropertyName, "PREF", &SourceListPref, &PropertyValue, SourceCount, &PropertyMatched);
 		
-		} else if (PropertyName == wxT("PID")){
-
-			SourceListPID.erase(*SourceCount);
-			SourceListPID.insert(std::make_pair(*SourceCount, PropertyValue));
+		if (PropertyMatched == TRUE){
 		
-		} else if (PropertyName == wxT("PREF")){
-			
-			ProcessIntegerValue(this, &SourceListPref, &PropertyValue, SourceCount);
-
-		} else if (PropertyName == wxT("MEDIATYPE")){
+			PropertyMatched = FALSE;
+			continue;
 		
-			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 (!PropertyName.IsEmpty() && !PropertyValue.IsEmpty() && PropertyName != wxT("TYPE")){
 			
-				if (FirstToken == TRUE){
-				
-					PropertyTokens.Append(PropertyName + wxT("=") + PropertyValue);
-					FirstToken = FALSE;
-				
-				} else {
-				
-					PropertyTokens.Append(wxT(";") + PropertyName + wxT("=") + PropertyValue);
+			if (FirstToken == TRUE){
 				
-				}
+				PropertyTokens.Append(PropertyName + wxT("=") + PropertyValue);
+				FirstToken = FALSE;
+			
+			} else {
+			
+				PropertyTokens.Append(wxT(";") + PropertyName + wxT("=") + PropertyValue);
 			
 			}
 		
@@ -693,6 +671,7 @@ void ContactDataObject::ProcessXML(wxString PropertySeg1, wxString PropertySeg2,
 	wxString PropertyTokens;
 	std::map<int,int>::iterator SLiter;
 	bool FirstToken = TRUE;
+	bool PropertyMatched = FALSE;
 	
 	for (std::map<int, int>::iterator intiter = SplitPoints.begin(); 
 	intiter != SplitPoints.end(); ++intiter){
@@ -709,10 +688,12 @@ void ContactDataObject::ProcessXML(wxString PropertySeg1, wxString PropertySeg2,
 		
 		CaptureString(&PropertyValue, FALSE);
 	
-		if (PropertyName == wxT("ALTID")){
-
-			XMLListAltID.erase(*XMLCount);
-			XMLListAltID.insert(std::make_pair(*XMLCount, PropertyValue));
+		ProcessStringValue(&PropertyName, "ALTID", &XMLListAltID, &PropertyValue, XMLCount, &PropertyMatched);
+		
+		if (PropertyMatched == TRUE){
+		
+			PropertyMatched = FALSE;
+			continue;
 		
 		}
 		
@@ -741,6 +722,7 @@ void ContactDataObject::ProcessMember(wxString PropertySeg1, wxString PropertySe
 	wxString PropertyTokens;
 	std::map<int,int>::iterator SLiter;
 	bool FirstToken = TRUE;
+	bool PropertyMatched = FALSE;
 	
 	for (std::map<int, int>::iterator intiter = SplitPoints.begin(); 
 	intiter != SplitPoints.end(); ++intiter){
@@ -757,26 +739,19 @@ void ContactDataObject::ProcessMember(wxString PropertySeg1, wxString PropertySe
 		
 		CaptureString(&PropertyValue, FALSE);
 	
-		if (PropertyName == wxT("ALTID")){
-
-			GroupsListAltID.erase(*GroupCount);
-			GroupsListAltID.insert(std::make_pair(*GroupCount, PropertyValue));
+		ProcessStringValue(&PropertyName, "ALTID", &GroupsListAltID, &PropertyValue, GroupCount, &PropertyMatched);
+		ProcessStringValue(&PropertyName, "PID", &GroupsListPID, &PropertyValue, GroupCount, &PropertyMatched);
+		ProcessStringValue(&PropertyName, "MEDIATYPE", &GroupsListMediaType, &PropertyValue, GroupCount, &PropertyMatched);
+		ProcessIntegerValue(&PropertyName, "PREF", &GroupsListPref, &PropertyValue, GroupCount, &PropertyMatched);
 		
-		} else if (PropertyName == wxT("PID")){
-
-			GroupsListPID.erase(*GroupCount);
-			GroupsListPID.insert(std::make_pair(*GroupCount, PropertyValue));
+		if (PropertyMatched == TRUE){
 		
-		} else if (PropertyName == wxT("PREF")){
-
-			ProcessIntegerValue(this, &GroupsListPref, &PropertyValue, GroupCount);
+			PropertyMatched = FALSE;
+			continue;
 		
-		} else if (PropertyName == wxT("MEDIATYPE")){
-
-			GroupsListMediaType.erase(*GroupCount);
-			GroupsListMediaType.insert(std::make_pair(*GroupCount, PropertyValue));
+		}
 		
-		} else if (!PropertyName.IsEmpty() && !PropertyValue.IsEmpty()){
+		if (!PropertyName.IsEmpty() && !PropertyValue.IsEmpty()){
 			
 			if (FirstToken == TRUE){
 				
@@ -823,6 +798,7 @@ void ContactDataObject::ProcessFN(wxString PropertySeg1, wxString PropertySeg2,
 	wxString PropertyTokens;
 	std::map<int,int>::iterator SLiter;
 	bool FirstToken = TRUE;
+	bool PropertyMatched = FALSE;
 	
 	for (std::map<int, int>::iterator intiter = SplitPoints.begin(); 
 	intiter != SplitPoints.end(); ++intiter){
@@ -848,27 +824,24 @@ void ContactDataObject::ProcessFN(wxString PropertySeg1, wxString PropertySeg2,
 				FullNamesListType.insert(std::make_pair(*FNCount, PropertyValue));
 		
 			}
+			
+			PropertyMatched = TRUE;
 		
-		} else if (PropertyName == wxT("LANGUAGE")){
-
-			FullNamesListLanguage.erase(*FNCount);
-			FullNamesListLanguage.insert(std::make_pair(*FNCount, PropertyValue));
+		}
 		
-		} else if (PropertyName == wxT("ALTID")){
+		ProcessStringValue(&PropertyName, "ALTID", &FullNamesListAltID, &PropertyValue, FNCount, &PropertyMatched);
+		ProcessStringValue(&PropertyName, "PID", &FullNamesListPID, &PropertyValue, FNCount, &PropertyMatched);
+		ProcessStringValue(&PropertyName, "LANGUAGE", &FullNamesListLanguage, &PropertyValue, FNCount, &PropertyMatched);
+		ProcessIntegerValue(&PropertyName, "PREF", &FullNamesListPref, &PropertyValue, FNCount, &PropertyMatched);
 		
-			FullNamesListAltID.erase(*FNCount);
-			FullNamesListAltID.insert(std::make_pair(*FNCount, PropertyValue));
+		if (PropertyMatched == TRUE){
 		
-		} else if (PropertyName == wxT("PID")){
-
-			FullNamesListPID.erase(*FNCount);
-			FullNamesListPID.insert(std::make_pair(*FNCount, PropertyValue));
+			PropertyMatched = FALSE;
+			continue;
 		
-		} else if (PropertyName == wxT("PREF")){
-
-			ProcessIntegerValue(this, &FullNamesListPref, &PropertyValue, FNCount);
+		}
 		
-		} else if (!PropertyName.IsEmpty() && !PropertyValue.IsEmpty()){
+		if (!PropertyName.IsEmpty() && !PropertyValue.IsEmpty()){
 			
 			if (FirstToken == TRUE){
 				
@@ -1085,39 +1058,22 @@ void ContactDataObject::ProcessClientPIDMap(wxString PropertySeg1, wxString Prop
 		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 (!PropertyName.IsEmpty() && !PropertyValue.IsEmpty()){
 							
-		if (FirstToken == TRUE){
+			if (FirstToken == TRUE){
 				
-			PropertyTokens.Append(PropertyName + wxT("=") + PropertyValue);
-			FirstToken = FALSE;
+				PropertyTokens.Append(PropertyName + wxT("=") + PropertyValue);
+				FirstToken = FALSE;
 				
-		} else {
+			} else {
 				
-			PropertyTokens.Append(wxT(";") + PropertyName + wxT("=") + PropertyValue);
+				PropertyTokens.Append(wxT(";") + PropertyName + wxT("=") + PropertyValue);
 				
+			}
+		
 		}
 	
 	}	
@@ -1198,6 +1154,7 @@ void ContactDataObject::ProcessNickname(wxString PropertySeg1, wxString Property
 	wxString PropertyValue;
 	wxString PropertyTokens;
 	bool FirstToken = TRUE;
+	bool PropertyMatched = FALSE;
 	
 	for (std::map<int, int>::iterator intiter = SplitPoints.begin(); 
 	intiter != SplitPoints.end(); ++intiter){
@@ -1214,45 +1171,31 @@ void ContactDataObject::ProcessNickname(wxString PropertySeg1, wxString Property
 		
 		CaptureString(&PropertyValue, FALSE);
 		
-		if (PropertyName == wxT("ALTID")){
-
-			NicknamesListAltID->erase(*NicknameCount);
-			NicknamesListAltID->insert(std::make_pair(*NicknameCount, PropertyValue));
+		ProcessStringValue(&PropertyName, "ALTID", NicknamesListAltID, &PropertyValue, NicknameCount, &PropertyMatched);
+		ProcessStringValue(&PropertyName, "PID", NicknamesListPID, &PropertyValue, NicknameCount, &PropertyMatched);
+		ProcessStringValue(&PropertyName, "LANGUAGE", NicknamesListLanguage, &PropertyValue, NicknameCount, &PropertyMatched);
+		ProcessIntegerValue(&PropertyName, "PREF", NicknamesListPref, &PropertyValue, NicknameCount, &PropertyMatched);
 		
-		} else if (PropertyName == wxT("PID")){
-
-			NicknamesListPID->erase(*NicknameCount);
-			NicknamesListPID->insert(std::make_pair(*NicknameCount, PropertyValue));	
-
-		} else if (PropertyName == wxT("PREF")){
-
-			ProcessIntegerValue(this, NicknamesListPref, &PropertyValue, NicknameCount);
+		if (PropertyMatched == TRUE){
 		
-		} else if (PropertyName == wxT("LANGUAGE")){
-
-			NicknamesListLanguage->erase(*NicknameCount);
-			NicknamesListLanguage->insert(std::make_pair(*NicknameCount, PropertyValue));	
-
-		} else {
+			PropertyMatched = FALSE;
+			continue;
 		
-			// Something else we don't know about so append
-			// to the tokens variable.
+		}
 		
-			if (!PropertyName.IsEmpty() && !PropertyValue.IsEmpty() && PropertyName != wxT("TYPE")){
+		if (!PropertyName.IsEmpty() && !PropertyValue.IsEmpty() && PropertyName != wxT("TYPE")){
+	
+			if (FirstToken == TRUE){
 		
-				if (FirstToken == TRUE){
-			
-					PropertyTokens.Append(PropertyName + wxT("=") + PropertyValue);
-					FirstToken = FALSE;
-			
-				} else {
-			
-					PropertyTokens.Append(wxT(";") + PropertyName + wxT("=") + PropertyValue);
-			
-				}
+				PropertyTokens.Append(PropertyName + wxT("=") + PropertyValue);
+				FirstToken = FALSE;
 		
-			}
+			} else {
+		
+				PropertyTokens.Append(wxT(";") + PropertyName + wxT("=") + PropertyValue);
 		
+			}
+	
 		}
 		
 	}
@@ -1673,6 +1616,7 @@ void ContactDataObject::ProcessTimeZone(wxString PropertySeg1, wxString Property
 	wxString PropertyValue;
 	wxString PropertyTokens;
 	bool FirstToken = TRUE;
+	bool PropertyMatched = FALSE;
 	
 	for (std::map<int, int>::iterator intiter = SplitPoints.begin(); 
 	intiter != SplitPoints.end(); ++intiter){
@@ -1689,45 +1633,31 @@ void ContactDataObject::ProcessTimeZone(wxString PropertySeg1, wxString Property
 		
 		CaptureString(&PropertyValue, FALSE);
 
-		if (PropertyName == wxT("ALTID")){
-
-			TZListAltID->erase(*TimeZoneCount);
-			TZListAltID->insert(std::make_pair(*TimeZoneCount, PropertyValue));
+		ProcessStringValue(&PropertyName, "ALTID", TZListAltID, &PropertyValue, TimeZoneCount, &PropertyMatched);
+		ProcessStringValue(&PropertyName, "PID", TZListPID, &PropertyValue, TimeZoneCount, &PropertyMatched);
+		ProcessStringValue(&PropertyName, "MEDIATYPE", TZListMediatype, &PropertyValue, TimeZoneCount, &PropertyMatched);
+		ProcessIntegerValue(&PropertyName, "PREF", TZListPref, &PropertyValue, TimeZoneCount, &PropertyMatched);
 		
-		} else if (PropertyName == wxT("PID")){
-
-			TZListPID->erase(*TimeZoneCount);
-			TZListPID->insert(std::make_pair(*TimeZoneCount, PropertyValue));	
-
-		} else if (PropertyName == wxT("PREF")){
-
-			ProcessIntegerValue(this, TZListPref, &PropertyValue, TimeZoneCount);
+		if (PropertyMatched == TRUE){
 		
-		} else if (PropertyName == wxT("MEDIATYPE")){
-
-			TZListMediatype->erase(*TimeZoneCount);
-			TZListMediatype->insert(std::make_pair(*TimeZoneCount, PropertyValue));	
+			PropertyMatched = FALSE;
+			continue;
+		
+		}
 
-		} else {
+		if (!PropertyName.IsEmpty() && !PropertyValue.IsEmpty() && PropertyName != wxT("TYPE")){
+	
+			if (FirstToken == TRUE){
 		
-			// Something else we don't know about so append
-			// to the tokens variable.
+				PropertyTokens.Append(PropertyName + wxT("=") + PropertyValue);
+				FirstToken = FALSE;
 		
-			if (!PropertyName.IsEmpty() && !PropertyValue.IsEmpty() && PropertyName != wxT("TYPE")){
+			} else {
 		
-				if (FirstToken == TRUE){
-			
-					PropertyTokens.Append(PropertyName + wxT("=") + PropertyValue);
-					FirstToken = FALSE;
-			
-				} else {
-			
-					PropertyTokens.Append(wxT(";") + PropertyName + wxT("=") + PropertyValue);
-			
-				}
+				PropertyTokens.Append(wxT(";") + PropertyName + wxT("=") + PropertyValue);
 		
 			}
-		
+	
 		}
 		
 	}
@@ -1779,6 +1709,7 @@ void ContactDataObject::ProcessAddress(wxString PropertySeg1, wxString PropertyS
 	int intPref = 0;			
 	int intType = 0;
 	long ListCtrlIndex;
+	bool PropertyMatched = FALSE;
 	
 	SplitValues(&PropertySeg1, &SplitPoints, &SplitLength, intPrevValue);
 	
@@ -1881,62 +1812,35 @@ void ContactDataObject::ProcessAddress(wxString PropertySeg1, wxString PropertyS
 		
 		// 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")){
+		ProcessStringValue(&PropertyName, "LABEL", AddressListLabel, &PropertyValue, AddressCount, &PropertyMatched);
+		ProcessStringValue(&PropertyName, "LANGUAGE", AddressListLang, &PropertyValue, AddressCount, &PropertyMatched);
+		ProcessStringValue(&PropertyName, "ALTID", AddressListAltID, &PropertyValue, AddressCount, &PropertyMatched);
+		ProcessStringValue(&PropertyName, "PID", AddressListPID, &PropertyValue, AddressCount, &PropertyMatched);
+		ProcessStringValue(&PropertyName, "GEO", AddressListGeo, &PropertyValue, AddressCount, &PropertyMatched);
+		ProcessStringValue(&PropertyName, "TZ", AddressListTimezone, &PropertyValue, AddressCount, &PropertyMatched);
+		ProcessStringValue(&PropertyName, "MEDIATYPE", AddressListMediatype, &PropertyValue, AddressCount, &PropertyMatched);
+		ProcessIntegerValue(&PropertyName, "PREF", AddressListPref, &PropertyValue, AddressCount, &PropertyMatched);
 		
-			AddressListGeo->erase(*AddressCount);
-			AddressListGeo->insert(std::make_pair(*AddressCount, PropertyValue));
+		if (PropertyMatched == TRUE){
 		
-		} 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));
+			PropertyMatched = FALSE;
+			continue;
 		
-		} else if (PropertyName == wxT("PREF")){
-
-			ProcessIntegerValue(this, AddressListPref, &PropertyValue, AddressCount);
+		}
 		
-		} else {
+		if (!PropertyName.IsEmpty() && !PropertyValue.IsEmpty() && PropertyName != wxT("TYPE")){
 		
-			if (!PropertyName.IsEmpty() && !PropertyValue.IsEmpty() && PropertyName != wxT("TYPE")){
+			if (FirstToken == TRUE){
 			
-				if (FirstToken == TRUE){
-				
-					PropertyTokens.Append(PropertyName + wxT("=") + PropertyValue);
-					FirstToken = FALSE;
-				
-				} else {
-				
-					PropertyTokens.Append(wxT(";") + PropertyName + wxT("=") + PropertyValue);
-				
-				}
+				PropertyTokens.Append(PropertyName + wxT("=") + PropertyValue);
+				FirstToken = FALSE;
+			
+			} else {
+			
+				PropertyTokens.Append(wxT(";") + PropertyName + wxT("=") + PropertyValue);
 			
 			}
-		
+			
 		}
 	
 	}			
@@ -1988,7 +1892,6 @@ void ContactDataObject::ProcessAddress(wxString PropertySeg1, wxString PropertyS
 			
 			SLiter = SplitLength.find(1);
 								
-			//txtSurname->SetValue(ContactData.Convert(wxSPropertySeg2.Mid(0, SLiter->second), TRUE));
 			AddressPOBox = PropertySeg2.Mid(0, SLiter->second);
 			intPrevValue = intiter->second;
 		
@@ -1999,7 +1902,6 @@ void ContactDataObject::ProcessAddress(wxString PropertySeg1, wxString PropertyS
 			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){
@@ -2009,7 +1911,6 @@ void ContactDataObject::ProcessAddress(wxString PropertySeg1, wxString PropertyS
 			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){
@@ -2019,10 +1920,7 @@ void ContactDataObject::ProcessAddress(wxString PropertySeg1, wxString PropertyS
 			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){
 		
@@ -2031,10 +1929,8 @@ void ContactDataObject::ProcessAddress(wxString PropertySeg1, wxString PropertyS
 			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){
 		
@@ -2043,14 +1939,12 @@ void ContactDataObject::ProcessAddress(wxString PropertySeg1, wxString PropertyS
 			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;
 		
 		}
@@ -2153,6 +2047,7 @@ void ContactDataObject::ProcessEmail(wxString PropertySeg1, wxString PropertySeg
 	wxString PropertyValue;
 	wxString PropertyTokens;
 	bool FirstToken = TRUE;
+	bool PropertyMatched = FALSE;
 	
 	for (std::map<int, int>::iterator intiter = SplitPoints.begin(); 
 	intiter != SplitPoints.end(); ++intiter){
@@ -2171,37 +2066,30 @@ void ContactDataObject::ProcessEmail(wxString PropertySeg1, wxString PropertySeg
 		
 		// Process properties.
 		
-		if (PropertyName == wxT("ALTID")){
-
-			EmailListAltID->erase(*EmailCount);
-			EmailListAltID->insert(std::make_pair(*EmailCount, PropertyValue));
+		ProcessStringValue(&PropertyName, "ALTID", EmailListAltID, &PropertyValue, EmailCount, &PropertyMatched);
+		ProcessStringValue(&PropertyName, "PID", EmailListPID, &PropertyValue, EmailCount, &PropertyMatched);
+		ProcessIntegerValue(&PropertyName, "PREF", EmailListPref, &PropertyValue, EmailCount, &PropertyMatched);
 		
-		} else if (PropertyName == wxT("PID")){
-
-			EmailListPID->erase(*EmailCount);
-			EmailListPID->insert(std::make_pair(*EmailCount, PropertyValue));
+		if (PropertyMatched == TRUE){
 		
-		} else if (PropertyName == wxT("PREF")){
-			
-			ProcessIntegerValue(this, EmailListPref, &PropertyValue, EmailCount);
+			PropertyMatched = FALSE;
+			continue;
 		
-		} else {
+		}
 		
-			if (!PropertyName.IsEmpty() && !PropertyValue.IsEmpty() && PropertyName != wxT("TYPE")){
+		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);
-				
-				}
+			if (FirstToken == TRUE){
+			
+				PropertyTokens.Append(PropertyName + wxT("=") + PropertyValue);
+				FirstToken = FALSE;
+			
+			} else {
+			
+				PropertyTokens.Append(wxT(";") + PropertyName + wxT("=") + PropertyValue);
 			
 			}
-		
+			
 		}
 	
 	}
@@ -2283,6 +2171,7 @@ void ContactDataObject::ProcessIM(wxString PropertySeg1, wxString PropertySeg2,
 	wxString PropertyValue;
 	wxString PropertyTokens;
 	bool FirstToken = TRUE;
+	bool PropertyMatched = FALSE;
 	
 	for (std::map<int, int>::iterator intiter = SplitPoints.begin(); 
 	intiter != SplitPoints.end(); ++intiter){
@@ -2299,41 +2188,30 @@ void ContactDataObject::ProcessIM(wxString PropertySeg1, wxString PropertySeg2,
 		
 		CaptureString(&PropertyValue, FALSE);
 		
+		ProcessStringValue(&PropertyName, "ALTID", IMListAltID, &PropertyValue, IMCount, &PropertyMatched);
+		ProcessStringValue(&PropertyName, "PID", IMListPID, &PropertyValue, IMCount, &PropertyMatched);
+		ProcessStringValue(&PropertyName, "MEDIATYPE", IMListMediatype, &PropertyValue, IMCount, &PropertyMatched);
+		ProcessIntegerValue(&PropertyName, "PREF", IMListPref, &PropertyValue, IMCount, &PropertyMatched);
+		
 		// Process properties.
 		
-		if (PropertyName == wxT("ALTID")){
-
-			IMListAltID->erase(*IMCount);
-			IMListAltID->insert(std::make_pair(*IMCount, PropertyValue));
+		if (PropertyMatched == TRUE){
+			
+			PropertyMatched = FALSE;
+			continue;
 		
-		} 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));
+		if (!PropertyName.IsEmpty() && !PropertyValue.IsEmpty() && PropertyName != wxT("TYPE")){
 		
-		} else if (PropertyName == wxT("PREF")){
+			if (FirstToken == TRUE){
 			
-			ProcessIntegerValue(this, IMListPref, &PropertyValue, IMCount);
-		
-		} else {
-		
-			if (!PropertyName.IsEmpty() && !PropertyValue.IsEmpty() && PropertyName != wxT("TYPE")){
+				PropertyTokens.Append(PropertyName + wxT("=") + PropertyValue);
+				FirstToken = FALSE;
 			
-				if (FirstToken == TRUE){
-				
-					PropertyTokens.Append(PropertyName + wxT("=") + PropertyValue);
-					FirstToken = FALSE;
-				
-				} else {
-				
-					PropertyTokens.Append(wxT(";") + PropertyName + wxT("=") + PropertyValue);
-				
-				}
+			} else {
+			
+				PropertyTokens.Append(wxT(";") + PropertyName + wxT("=") + PropertyValue);
 			
 			}
 		
@@ -2583,6 +2461,8 @@ void ContactDataObject::ProcessTelephone(wxString PropertySeg1, wxString Propert
 
 	intPrevValue = 4;
 	
+	bool PropertyMatched = FALSE;
+	
 	for (std::map<int, int>::iterator intiter = SplitPoints.begin(); 
 	intiter != SplitPoints.end(); ++intiter){
 	
@@ -2600,34 +2480,27 @@ void ContactDataObject::ProcessTelephone(wxString PropertySeg1, wxString Propert
 		
 		// Process properties.
 		
-		if (PropertyName == wxT("ALTID")){
-
-			TelephoneListAltID->erase(*TelephoneCount);
-			TelephoneListAltID->insert(std::make_pair(*TelephoneCount, PropertyValue));
+		ProcessStringValue(&PropertyName, "ALTID", TelephoneListAltID, &PropertyValue, TelephoneCount, &PropertyMatched);
+		ProcessStringValue(&PropertyName, "PID", TelephoneListPID, &PropertyValue, TelephoneCount, &PropertyMatched);
+		ProcessIntegerValue(&PropertyName, "PREF", TelephoneListPref, &PropertyValue, TelephoneCount, &PropertyMatched);
 		
-		} else if (PropertyName == wxT("PID")){
-
-			TelephoneListPID->erase(*TelephoneCount);
-			TelephoneListPID->insert(std::make_pair(*TelephoneCount, PropertyValue));
+		if (PropertyMatched == TRUE){
 		
-		} else if (PropertyName == wxT("PREF")){
-
-			ProcessIntegerValue(this, TelephoneListPref, &PropertyValue, TelephoneCount);
+			PropertyMatched = FALSE;
+			continue;
 		
-		} else {
+		}
+
+		if (!PropertyName.IsEmpty() && !PropertyValue.IsEmpty() && PropertyName != wxT("TYPE")){
 		
-			if (!PropertyName.IsEmpty() && !PropertyValue.IsEmpty() && PropertyName != wxT("TYPE")){
+			if (FirstToken == TRUE){
 			
-				if (FirstToken == TRUE){
-				
-					PropertyTokens.Append(PropertyName + wxT("=") + PropertyValue);
-					FirstToken = FALSE;
-				
-				} else {
-				
-					PropertyTokens.Append(wxT(";") + PropertyName + wxT("=") + PropertyValue);
-				
-				}
+				PropertyTokens.Append(PropertyName + wxT("=") + PropertyValue);
+				FirstToken = FALSE;
+			
+			} else {
+			
+				PropertyTokens.Append(wxT(";") + PropertyName + wxT("=") + PropertyValue);
 			
 			}
 		
@@ -2708,6 +2581,7 @@ void ContactDataObject::ProcessLanguage(wxString PropertySeg1, wxString Property
 	wxString PropertyValue;
 	wxString PropertyTokens;
 	bool FirstToken = TRUE;
+	bool PropertyMatched = FALSE;
 	
 	for (std::map<int, int>::iterator intiter = SplitPoints.begin(); 
 	intiter != SplitPoints.end(); ++intiter){
@@ -2726,34 +2600,27 @@ void ContactDataObject::ProcessLanguage(wxString PropertySeg1, wxString Property
 		
 		// Process properties.
 		
-		if (PropertyName == wxT("ALTID")){
+		ProcessStringValue(&PropertyName, "ALTID", LanguageListAltID, &PropertyValue, LanguageCount, &PropertyMatched);
+		ProcessStringValue(&PropertyName, "PID", LanguageListPID, &PropertyValue, LanguageCount, &PropertyMatched);
+		ProcessIntegerValue(&PropertyName, "PREF", LanguageListPref, &PropertyValue, LanguageCount, &PropertyMatched);
 
-			LanguageListAltID->erase(*LanguageCount);
-			LanguageListAltID->insert(std::make_pair(*LanguageCount, PropertyValue));
+		if (PropertyMatched == TRUE){
 		
-		} else if (PropertyName == wxT("PID")){
-
-			LanguageListPID->erase(*LanguageCount);
-			LanguageListPID->insert(std::make_pair(*LanguageCount, PropertyValue));
+			PropertyMatched = FALSE;
+			continue;
 		
-		} else if (PropertyName == wxT("PREF")){
-			
-			ProcessIntegerValue(this, LanguageListPref, &PropertyValue, LanguageCount);
+		}
 		
-		} else {
+		if (!PropertyName.IsEmpty() && !PropertyValue.IsEmpty() && PropertyName != wxT("TYPE")){
 		
-			if (!PropertyName.IsEmpty() && !PropertyValue.IsEmpty() && PropertyName != wxT("TYPE")){
+			if (FirstToken == TRUE){
 			
-				if (FirstToken == TRUE){
-				
-					PropertyTokens.Append(PropertyName + wxT("=") + PropertyValue);
-					FirstToken = FALSE;
-				
-				} else {
-				
-					PropertyTokens.Append(wxT(";") + PropertyName + wxT("=") + PropertyValue);
-				
-				}
+				PropertyTokens.Append(PropertyName + wxT("=") + PropertyValue);
+				FirstToken = FALSE;
+			
+			} else {
+			
+				PropertyTokens.Append(wxT(";") + PropertyName + wxT("=") + PropertyValue);
 			
 			}
 		
@@ -2837,6 +2704,7 @@ void ContactDataObject::ProcessGeographic(wxString PropertySeg1, wxString Proper
 	wxString PropertyValue;
 	wxString PropertyTokens;
 	bool FirstToken = TRUE;
+	bool PropertyMatched = FALSE;
 	
 	for (std::map<int, int>::iterator intiter = SplitPoints.begin(); 
 	intiter != SplitPoints.end(); ++intiter){
@@ -2855,39 +2723,28 @@ void ContactDataObject::ProcessGeographic(wxString PropertySeg1, wxString Proper
 		
 		// Process properties.
 		
-		if (PropertyName == wxT("ALTID")){
-
-			GeopositionListAltID->erase(*GeographicCount);
-			GeopositionListAltID->insert(std::make_pair(*GeographicCount, PropertyValue));
+		ProcessStringValue(&PropertyName, "ALTID", GeopositionListAltID, &PropertyValue, GeographicCount, &PropertyMatched);
+		ProcessStringValue(&PropertyName, "PID", GeopositionListPID, &PropertyValue, GeographicCount, &PropertyMatched);
+		ProcessStringValue(&PropertyName, "MEDIATYPE", GeopositionListMediatype, &PropertyValue, GeographicCount, &PropertyMatched);
+		ProcessIntegerValue(&PropertyName, "PREF", GeopositionListPref, &PropertyValue, GeographicCount, &PropertyMatched);
 		
-		} else if (PropertyName == wxT("PID")){
-
-			GeopositionListPID->erase(*GeographicCount);
-			GeopositionListPID->insert(std::make_pair(*GeographicCount, PropertyValue));
+		if (PropertyMatched == TRUE){
 		
-		} else if (PropertyName == wxT("MEDIATYPE")){
-
-			GeopositionListMediatype->erase(*GeographicCount);
-			GeopositionListMediatype->insert(std::make_pair(*GeographicCount, PropertyValue));
+			PropertyMatched = FALSE;
+			continue;
 		
-		} else if (PropertyName == wxT("PREF")){
-
-			ProcessIntegerValue(this, GeopositionListPref, &PropertyValue, GeographicCount);
+		}
 		
-		} else {
+		if (!PropertyName.IsEmpty() && !PropertyValue.IsEmpty() && PropertyName != wxT("TYPE")){
 		
-			if (!PropertyName.IsEmpty() && !PropertyValue.IsEmpty() && PropertyName != wxT("TYPE")){
+			if (FirstToken == TRUE){
 			
-				if (FirstToken == TRUE){
-				
-					PropertyTokens.Append(PropertyName + wxT("=") + PropertyValue);
-					FirstToken = FALSE;
-				
-				} else {
-				
-					PropertyTokens.Append(wxT(";") + PropertyName + wxT("=") + PropertyValue);
-				
-				}
+				PropertyTokens.Append(PropertyName + wxT("=") + PropertyValue);
+				FirstToken = FALSE;
+			
+			} else {
+			
+				PropertyTokens.Append(wxT(";") + PropertyName + wxT("=") + PropertyValue);
 			
 			}
 		
@@ -3044,6 +2901,8 @@ void ContactDataObject::ProcessRelated(wxString PropertySeg1, wxString PropertyS
 	
 	intPrevValue = 8;			
 	
+	bool PropertyMatched = FALSE;
+	
 	for (std::map<int, int>::iterator intiter = SplitPoints.begin(); 
 	intiter != SplitPoints.end(); ++intiter){
 	
@@ -3076,60 +2935,31 @@ void ContactDataObject::ProcessRelated(wxString PropertySeg1, wxString PropertyS
 		
 		CaptureString(&PropertyValue, FALSE);
 			
-		if (PropertyName == wxT("ALTID")){
-
-			GeneralRelatedListAltID.erase(*RelatedCount);
-			GeneralRelatedListAltID.insert(std::make_pair(*RelatedCount, PropertyValue));
-		
-		} else if (PropertyName == wxT("PID")){
+		ProcessStringValue(&PropertyName, "ALTID", &GeneralRelatedListAltID, &PropertyValue, RelatedCount, &PropertyMatched);
+		ProcessStringValue(&PropertyName, "PID", &GeneralRelatedListPID, &PropertyValue, RelatedCount, &PropertyMatched);
+		ProcessStringValue(&PropertyName, "LANGUAGE", &GeneralRelatedListLanguage, &PropertyValue, RelatedCount, &PropertyMatched);
+		ProcessIntegerValue(&PropertyName, "PREF", &GeneralRelatedListPref, &PropertyValue, RelatedCount, &PropertyMatched);
 
-			GeneralRelatedListPID.erase(*RelatedCount);
-			GeneralRelatedListPID.insert(std::make_pair(*RelatedCount, PropertyValue));
+		if (PropertyMatched == TRUE){
 		
-		} 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){
-
-				GeneralRelatedListPref.erase(*RelatedCount);
-				GeneralRelatedListPref.insert(std::make_pair(*RelatedCount, PriorityNumber));
-
-			}
+			PropertyMatched = FALSE;
+			continue;
 		
-		} else if (PropertyName == wxT("LANGUAGE")){
+		}
 
-			ProcessIntegerValue(this, &GeneralRelatedListPref, &PropertyValue, RelatedCount);
-		
-		} else if (PropertyName != wxT("TYPE")) {
+		if (!PropertyName.IsEmpty() && !PropertyValue.IsEmpty() && PropertyName != wxT("TYPE")){
+	
+			if (FirstToken == TRUE){
 		
-			// Something else we don't know about so append
-			// to the tokens variable.
+				PropertyTokens.Append(PropertyName + wxT("=") + PropertyValue);
+				FirstToken = FALSE;
 		
-			if (!PropertyName.IsEmpty() && !PropertyValue.IsEmpty() && PropertyName != wxT("TYPE")){
+			} else {
 		
-				if (FirstToken == TRUE){
-			
-					PropertyTokens.Append(PropertyName + wxT("=") + PropertyValue);
-					FirstToken = FALSE;
-			
-				} else {
-			
-					PropertyTokens.Append(wxT(";") + PropertyName + wxT("=") + PropertyValue);
-			
-				}
+				PropertyTokens.Append(wxT(";") + PropertyName + wxT("=") + PropertyValue);
 		
 			}
-		
+	
 		}
 	
 	}					
@@ -3215,6 +3045,7 @@ void ContactDataObject::ProcessURL(wxString PropertySeg1, wxString PropertySeg2,
 	}
 	
 	intPrevValue = 4;
+	bool PropertyMatched = FALSE;
 	
 	for (std::map<int, int>::iterator intiter = SplitPoints.begin(); 
 	intiter != SplitPoints.end(); ++intiter){
@@ -3248,45 +3079,31 @@ void ContactDataObject::ProcessURL(wxString PropertySeg1, wxString PropertySeg2,
 		
 		CaptureString(&PropertyValue, FALSE);
 		
-		if (PropertyName == wxT("ALTID")){
-
-			WebsiteListAltID->erase(*URLCount);
-			WebsiteListAltID->insert(std::make_pair(*URLCount, PropertyValue));
+		ProcessStringValue(&PropertyName, "ALTID", WebsiteListAltID, &PropertyValue, URLCount, &PropertyMatched);
+		ProcessStringValue(&PropertyName, "PID", WebsiteListPID, &PropertyValue, URLCount, &PropertyMatched);
+		ProcessStringValue(&PropertyName, "MEDIATYPE", WebsiteListMediatype, &PropertyValue, URLCount, &PropertyMatched);
+		ProcessIntegerValue(&PropertyName, "PREF", WebsiteListPref, &PropertyValue, URLCount, &PropertyMatched);
 		
-		} else if (PropertyName == wxT("PID")){
-
-			WebsiteListPID->erase(*URLCount);
-			WebsiteListPID->insert(std::make_pair(*URLCount, PropertyValue));
-			
-		} else if (PropertyName == wxT("PREF")){
-
-			ProcessIntegerValue(this, WebsiteListPref, &PropertyValue, URLCount);
-							
-		} else if (PropertyName == wxT("MEDIATYPE")){
+		if (PropertyMatched == TRUE){
 		
-			WebsiteListMediatype->erase(*URLCount);
-			WebsiteListMediatype->insert(std::make_pair(*URLCount, PropertyValue));
+			PropertyMatched = FALSE;
+			continue;
 		
-		} 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){
 		
-			if (!PropertyName.IsEmpty() && !PropertyValue.IsEmpty() && PropertyName != wxT("TYPE")){
+				PropertyTokens.Append(PropertyName + wxT("=") + PropertyValue);
+				FirstToken = FALSE;
 		
-				if (FirstToken == TRUE){
-			
-					PropertyTokens.Append(PropertyName + wxT("=") + PropertyValue);
-					FirstToken = FALSE;
-			
-				} else {
-			
-					PropertyTokens.Append(wxT(";") + PropertyName + wxT("=") + PropertyValue);
-			
-				}
+			} else {
 		
-			}
+				PropertyTokens.Append(wxT(";") + PropertyName + wxT("=") + PropertyValue);
 		
+			}
+	
 		}
 	
 	}
@@ -3373,6 +3190,7 @@ void ContactDataObject::ProcessTitle(wxString PropertySeg1, wxString PropertySeg
 	}
 
 	intPrevValue = 6;
+	bool PropertyMatched = FALSE;
 		
 	for (std::map<int, int>::iterator intiter = SplitPoints.begin(); 
 	intiter != SplitPoints.end(); ++intiter){
@@ -3406,45 +3224,31 @@ void ContactDataObject::ProcessTitle(wxString PropertySeg1, wxString PropertySeg
 		
 		CaptureString(&PropertyValue, FALSE);
 		
-		if (PropertyName == wxT("ALTID")){
+		ProcessStringValue(&PropertyName, "ALTID", TitleListAltID, &PropertyValue, TitleCount, &PropertyMatched);
+		ProcessStringValue(&PropertyName, "PID", TitleListPID, &PropertyValue, TitleCount, &PropertyMatched);
+		ProcessStringValue(&PropertyName, "LANGUAGE", TitleListLanguage, &PropertyValue, TitleCount, &PropertyMatched);
+		ProcessIntegerValue(&PropertyName, "PREF", TitleListPref, &PropertyValue, TitleCount, &PropertyMatched);
 		
-			TitleListAltID->erase(*TitleCount);
-			TitleListAltID->insert(std::make_pair(*TitleCount, PropertyValue));
+		if (PropertyMatched == TRUE){
 		
-		} else if (PropertyName == wxT("PID")){
-
-			TitleListPID->erase(*TitleCount);
-			TitleListPID->insert(std::make_pair(*TitleCount, PropertyValue));
+			PropertyMatched = FALSE;
+			continue;
 		
-		} else if (PropertyName == wxT("PREF")){
+		}
 
-			ProcessIntegerValue(this, TitleListPref, &PropertyValue, TitleCount);
-			
-		} else if (PropertyName == wxT("LANGUAGE")){
-		
-			TitleListLanguage->erase(*TitleCount);
-			TitleListLanguage->insert(std::make_pair(*TitleCount, PropertyValue));
-		
-		} else {
+		if (!PropertyName.IsEmpty() && !PropertyValue.IsEmpty() && PropertyName != wxT("TYPE")){
+	
+			if (FirstToken == TRUE){
 		
-			// Something else we don't know about so append
-			// to the tokens variable.
+				PropertyTokens.Append(PropertyName + wxT("=") + PropertyValue);
+				FirstToken = FALSE;
 		
-			if (!PropertyName.IsEmpty() && !PropertyValue.IsEmpty() && PropertyName != wxT("TYPE")){
+			} else {
 		
-				if (FirstToken == TRUE){
-			
-					PropertyTokens.Append(PropertyName + wxT("=") + PropertyValue);
-					FirstToken = FALSE;
-			
-				} else {
-			
-					PropertyTokens.Append(wxT(";") + PropertyName + wxT("=") + PropertyValue);
-			
-				}
+				PropertyTokens.Append(wxT(";") + PropertyName + wxT("=") + PropertyValue);
 		
 			}
-		
+	
 		}
 	
 	}
@@ -3531,6 +3335,7 @@ void ContactDataObject::ProcessRole(wxString PropertySeg1, wxString PropertySeg2
 	}
 
 	intPrevValue = 5;
+	bool PropertyMatched = FALSE;
 		
 	for (std::map<int, int>::iterator intiter = SplitPoints.begin(); 
 	intiter != SplitPoints.end(); ++intiter){
@@ -3564,47 +3369,33 @@ void ContactDataObject::ProcessRole(wxString PropertySeg1, wxString PropertySeg2
 		
 		CaptureString(&PropertyValue, FALSE);
 		
-		if (PropertyName == wxT("ALTID")){
-		
-			RoleListAltID->erase(*RoleCount);
-			RoleListAltID->insert(std::make_pair(*RoleCount, PropertyValue));
+		ProcessStringValue(&PropertyName, "ALTID", RoleListAltID, &PropertyValue, RoleCount, &PropertyMatched);
+		ProcessStringValue(&PropertyName, "PID", RoleListPID, &PropertyValue, RoleCount, &PropertyMatched);
+		ProcessStringValue(&PropertyName, "LANGUAGE", RoleListLanguage, &PropertyValue, RoleCount, &PropertyMatched);
+		ProcessIntegerValue(&PropertyName, "PREF", RoleListPref, &PropertyValue, RoleCount, &PropertyMatched);
 		
-		} else if (PropertyName == wxT("PID")){
-
-			RoleListPID->erase(*RoleCount);
-			RoleListPID->insert(std::make_pair(*RoleCount, PropertyValue));
+		if (PropertyMatched == TRUE){
 		
-		} else if (PropertyName == wxT("PREF")){
-
-			ProcessIntegerValue(this, RoleListPref, &PropertyValue, RoleCount);
-				
-		} else if (PropertyName == wxT("LANGUAGE")){
+			PropertyMatched = FALSE;
+			continue;
 		
-			RoleListLanguage->erase(*RoleCount);
-			RoleListLanguage->insert(std::make_pair(*RoleCount, PropertyValue));
+		}
 		
-		} else {
+		if (!PropertyName.IsEmpty() && !PropertyValue.IsEmpty() && PropertyName != wxT("TYPE")){
+	
+			if (FirstToken == TRUE){
 		
-			// Something else we don't know about so append
-			// to the tokens variable.
+				PropertyTokens.Append(PropertyName + wxT("=") + PropertyValue);
+				FirstToken = FALSE;
 		
-			if (!PropertyName.IsEmpty() && !PropertyValue.IsEmpty() && PropertyName != wxT("TYPE")){
+			} else {
 		
-				if (FirstToken == TRUE){
-			
-					PropertyTokens.Append(PropertyName + wxT("=") + PropertyValue);
-					FirstToken = FALSE;
-			
-				} else {
-			
-					PropertyTokens.Append(wxT(";") + PropertyName + wxT("=") + PropertyValue);
-			
-				}
+				PropertyTokens.Append(wxT(";") + PropertyName + wxT("=") + PropertyValue);
 		
 			}
-		
-		}
 	
+		}
+		
 	}
 	
 	// Add the data to the General/Home/Work address variables.
@@ -3693,6 +3484,7 @@ void ContactDataObject::ProcessOrganisation(wxString PropertySeg1, wxString Prop
 	}
 
 	intPrevValue = 4;
+	bool PropertyMatched = FALSE;
 		
 	for (std::map<int, int>::iterator intiter = SplitPoints.begin(); 
 	intiter != SplitPoints.end(); ++intiter){
@@ -3726,52 +3518,34 @@ void ContactDataObject::ProcessOrganisation(wxString PropertySeg1, wxString Prop
 		
 		CaptureString(&PropertyValue, FALSE);
 		
-		if (PropertyName == wxT("ALTID")){
-		
-			OrganisationsListAltID->erase(*OrganisationCount);
-			OrganisationsListAltID->insert(std::make_pair(*OrganisationCount, PropertyValue));
+		ProcessStringValue(&PropertyName, "ALTID", OrganisationsListAltID, &PropertyValue, OrganisationCount, &PropertyMatched);
+		ProcessStringValue(&PropertyName, "PID", OrganisationsListPID, &PropertyValue, OrganisationCount, &PropertyMatched);
+		ProcessStringValue(&PropertyName, "LANGUAGE", OrganisationsListLanguage, &PropertyValue, OrganisationCount, &PropertyMatched);
+		ProcessStringValue(&PropertyName, "SORT-AS", OrganisationsListSortAs, &PropertyValue, OrganisationCount, &PropertyMatched);
+		ProcessIntegerValue(&PropertyName, "PREF", OrganisationsListPref, &PropertyValue, OrganisationCount, &PropertyMatched);
 		
-		} else if (PropertyName == wxT("PID")){
-
-			OrganisationsListPID->erase(*OrganisationCount);
-			OrganisationsListPID->insert(std::make_pair(*OrganisationCount, PropertyValue));
-		
-		} else if (PropertyName == wxT("SORT-AS")){
-
-			OrganisationsListSortAs->erase(*OrganisationCount);
-			OrganisationsListSortAs->insert(std::make_pair(*OrganisationCount, PropertyValue));
+		if (PropertyMatched == TRUE){
 		
-		} else if (PropertyName == wxT("PREF")){
-
-			ProcessIntegerValue(this, OrganisationsListPref, &PropertyValue, OrganisationCount);
-			
-		} else if (PropertyName == wxT("LANGUAGE")){
+			PropertyMatched = FALSE;
+			continue;
 		
-			OrganisationsListLanguage->erase(*OrganisationCount);
-			OrganisationsListLanguage->insert(std::make_pair(*OrganisationCount, PropertyValue));
+		}
 		
-		} else {
+		if (!PropertyName.IsEmpty() && !PropertyValue.IsEmpty() && PropertyName != wxT("TYPE")){
+	
+			if (FirstToken == TRUE){
 		
-			// Something else we don't know about so append
-			// to the tokens variable.
+				PropertyTokens.Append(PropertyName + wxT("=") + PropertyValue);
+				FirstToken = FALSE;
 		
-			if (!PropertyName.IsEmpty() && !PropertyValue.IsEmpty() && PropertyName != wxT("TYPE")){
+			} else {
 		
-				if (FirstToken == TRUE){
-			
-					PropertyTokens.Append(PropertyName + wxT("=") + PropertyValue);
-					FirstToken = FALSE;
-			
-				} else {
-			
-					PropertyTokens.Append(wxT(";") + PropertyName + wxT("=") + PropertyValue);
-			
-				}
+				PropertyTokens.Append(wxT(";") + PropertyName + wxT("=") + PropertyValue);
 		
 			}
-		
-		}
 	
+		}
+
 	}
 	
 	// Add the data to the General/Home/Work address variables.
@@ -3856,6 +3630,7 @@ void ContactDataObject::ProcessNote(wxString PropertySeg1, wxString PropertySeg2
 	}
 
 	intPrevValue = 5;
+	bool PropertyMatched = FALSE;
 		
 	for (std::map<int, int>::iterator intiter = SplitPoints.begin(); 
 	intiter != SplitPoints.end(); ++intiter){
@@ -3889,45 +3664,31 @@ void ContactDataObject::ProcessNote(wxString PropertySeg1, wxString PropertySeg2
 		
 		CaptureString(&PropertyValue, FALSE);
 		
-		if (PropertyName == wxT("ALTID")){
+		ProcessStringValue(&PropertyName, "ALTID", NoteListAltID, &PropertyValue, NoteCount, &PropertyMatched);
+		ProcessStringValue(&PropertyName, "PID", NoteListPID, &PropertyValue, NoteCount, &PropertyMatched);
+		ProcessStringValue(&PropertyName, "LANGUAGE", NoteListLanguage, &PropertyValue, NoteCount, &PropertyMatched);
+		ProcessIntegerValue(&PropertyName, "PREF", NoteListPref, &PropertyValue, NoteCount, &PropertyMatched);
 		
-			NoteListAltID->erase(*NoteCount);
-			NoteListAltID->insert(std::make_pair(*NoteCount, PropertyValue));
+		if (PropertyMatched == TRUE){
 		
-		} else if (PropertyName == wxT("PID")){
-
-			NoteListPID->erase(*NoteCount);
-			NoteListPID->insert(std::make_pair(*NoteCount, PropertyValue));
+			PropertyMatched = FALSE;
+			continue;
 		
-		} else if (PropertyName == wxT("PREF")){
+		}
 
-			ProcessIntegerValue(this, NoteListPref, &PropertyValue, NoteCount);
-		
-		} else if (PropertyName == wxT("LANGUAGE")){
-		
-			NoteListLanguage->erase(*NoteCount);
-			NoteListLanguage->insert(std::make_pair(*NoteCount, PropertyValue));
-		
-		} else {
+		if (!PropertyName.IsEmpty() && !PropertyValue.IsEmpty() && PropertyName != wxT("TYPE")){
+	
+			if (FirstToken == TRUE){
 		
-			// Something else we don't know about so append
-			// to the tokens variable.
+				PropertyTokens.Append(PropertyName + wxT("=") + PropertyValue);
+				FirstToken = FALSE;
 		
-			if (!PropertyName.IsEmpty() && !PropertyValue.IsEmpty() && PropertyName != wxT("TYPE")){
+			} else {
 		
-				if (FirstToken == TRUE){
-			
-					PropertyTokens.Append(PropertyName + wxT("=") + PropertyValue);
-					FirstToken = FALSE;
-			
-				} else {
-			
-					PropertyTokens.Append(wxT(";") + PropertyName + wxT("=") + PropertyValue);
-			
-				}
+				PropertyTokens.Append(wxT(";") + PropertyName + wxT("=") + PropertyValue);
 		
 			}
-		
+	
 		}
 	
 	}
@@ -3985,6 +3746,7 @@ void ContactDataObject::ProcessCategory(wxString PropertySeg1, wxString Property
 	}
 
 	intPrevValue = 11;
+	bool PropertyMatched = FALSE;
 		
 	for (std::map<int, int>::iterator intiter = SplitPoints.begin(); 
 	intiter != SplitPoints.end(); ++intiter){
@@ -4018,45 +3780,31 @@ void ContactDataObject::ProcessCategory(wxString PropertySeg1, wxString Property
 		
 		CaptureString(&PropertyValue, FALSE);
 		
-		if (PropertyName == wxT("ALTID")){
+		ProcessStringValue(&PropertyName, "ALTID", &CategoriesListAltID, &PropertyValue, CategoryCount, &PropertyMatched);
+		ProcessStringValue(&PropertyName, "PID", &CategoriesListPID, &PropertyValue, CategoryCount, &PropertyMatched);
+		ProcessStringValue(&PropertyName, "LANGUAGE", &CategoriesListLanguage, &PropertyValue, CategoryCount, &PropertyMatched);
+		ProcessIntegerValue(&PropertyName, "PREF", &CategoriesListPref, &PropertyValue, CategoryCount, &PropertyMatched);
 		
-			CategoriesListAltID.erase(*CategoryCount);
-			CategoriesListAltID.insert(std::make_pair(*CategoryCount, PropertyValue));
+		if (PropertyMatched == TRUE){
 		
-		} else if (PropertyName == wxT("PID")){
-
-			CategoriesListPID.erase(*CategoryCount);
-			CategoriesListPID.insert(std::make_pair(*CategoryCount, PropertyValue));
+			PropertyMatched = FALSE;
+			continue;
 		
-		} else if (PropertyName == wxT("PREF")){
+		}
 
-			ProcessIntegerValue(this, &CategoriesListPref, &PropertyValue, CategoryCount);
-			
-		} else if (PropertyName == wxT("LANGUAGE")){
-		
-			CategoriesListLanguage.erase(*CategoryCount);
-			CategoriesListLanguage.insert(std::make_pair(*CategoryCount, PropertyValue));
-		
-		} else {
+		if (!PropertyName.IsEmpty() && !PropertyValue.IsEmpty() && PropertyName != wxT("TYPE")){
+	
+			if (FirstToken == TRUE){
 		
-			// Something else we don't know about so append
-			// to the tokens variable.
+				PropertyTokens.Append(PropertyName + wxT("=") + PropertyValue);
+				FirstToken = FALSE;
 		
-			if (!PropertyName.IsEmpty() && !PropertyValue.IsEmpty() && PropertyName != wxT("TYPE")){
+			} else {
 		
-				if (FirstToken == TRUE){
-			
-					PropertyTokens.Append(PropertyName + wxT("=") + PropertyValue);
-					FirstToken = FALSE;
-			
-				} else {
-			
-					PropertyTokens.Append(wxT(";") + PropertyName + wxT("=") + PropertyValue);
-			
-				}
+				PropertyTokens.Append(wxT(";") + PropertyName + wxT("=") + PropertyValue);
 		
 			}
-		
+	
 		}
 	
 	}
@@ -4258,6 +4006,7 @@ void ContactDataObject::ProcessPhoto(wxString PropertySeg1, wxString PropertySeg
 	CheckType(&PropertySeg1, &SplitPoints, &SplitLength, &intPrevValue, &PropType);
 
 	intPrevValue = 6;
+	bool PropertyMatched = FALSE;
 
 	for (std::map<int, int>::iterator intiter = SplitPoints.begin(); 
 	intiter != SplitPoints.end(); ++intiter){
@@ -4291,47 +4040,33 @@ void ContactDataObject::ProcessPhoto(wxString PropertySeg1, wxString PropertySeg
 		
 		CaptureString(&PropertyValue, FALSE);
 		
-		if (PropertyName == wxT("ALTID")){
-
-			PicturesListAltID.erase(*PhotoCount);
-			PicturesListAltID.insert(std::make_pair(*PhotoCount, PropertyValue));
-		
-		} else if (PropertyName == wxT("PID")){
-
-			PicturesListPID.erase(*PhotoCount);
-			PicturesListPID.insert(std::make_pair(*PhotoCount, PropertyValue));
+		ProcessStringValue(&PropertyName, "ALTID", &PicturesListAltID, &PropertyValue, PhotoCount, &PropertyMatched);
+		ProcessStringValue(&PropertyName, "PID", &PicturesListPID, &PropertyValue, PhotoCount, &PropertyMatched);
+		ProcessStringValue(&PropertyName, "MEDIATYPE", &PicturesListMediatype, &PropertyValue, PhotoCount, &PropertyMatched);
+		ProcessIntegerValue(&PropertyName, "PREF", &PicturesListPref, &PropertyValue, PhotoCount, &PropertyMatched);
 		
-		} else if (PropertyName == wxT("PREF")){
-
-			ProcessIntegerValue(this, &PicturesListPref, &PropertyValue, PhotoCount);
+		if (PropertyMatched == TRUE){
 		
-		} else if (PropertyName == wxT("MEDIATYPE")){
+			PropertyMatched = FALSE;
+			continue;
 		
-			PicturesListMediatype.erase(*PhotoCount);
-			PicturesListMediatype.insert(std::make_pair(*PhotoCount, PropertyValue));
-					
-		} else {
+		}
+
+		if (!PropertyName.IsEmpty() && !PropertyValue.IsEmpty() && PropertyName != wxT("TYPE")){
 		
-			// Something else we don't know about so append
-			// to the tokens variable.
+			if (FirstToken == TRUE){
 			
-			if (!PropertyName.IsEmpty() && !PropertyValue.IsEmpty() && PropertyName != wxT("TYPE")){
+				PropertyTokens.Append(PropertyName + wxT("=") + PropertyValue);
+				FirstToken = FALSE;
 			
-				if (FirstToken == TRUE){
-				
-					PropertyTokens.Append(PropertyName + wxT("=") + PropertyValue);
-					FirstToken = FALSE;
-				
-				} else {
-				
-					PropertyTokens.Append(wxT(";") + PropertyName + wxT("=") + PropertyValue);
-				
-				}
+			} else {
+			
+				PropertyTokens.Append(wxT(";") + PropertyName + wxT("=") + PropertyValue);
 			
 			}
 		
 		}
-	
+			
 	}	
 	
 	intPropertyLen = PropertySeg2.Len();
@@ -4459,6 +4194,7 @@ void ContactDataObject::ProcessLogo(wxString PropertySeg1, wxString PropertySeg2
 	CheckType(&PropertySeg1, &SplitPoints, &SplitLength, &intPrevValue, &PropType);
 
 	intPrevValue = 5;
+	bool PropertyMatched = FALSE;
 
 	for (std::map<int, int>::iterator intiter = SplitPoints.begin(); 
 	intiter != SplitPoints.end(); ++intiter){
@@ -4492,42 +4228,28 @@ void ContactDataObject::ProcessLogo(wxString PropertySeg1, wxString PropertySeg2
 		
 		CaptureString(&PropertyValue, FALSE);
 		
-		if (PropertyName == wxT("ALTID")){
-
-			LogosListAltID.erase(*LogoCount);
-			LogosListAltID.insert(std::make_pair(*LogoCount, PropertyValue));
-		
-		} else if (PropertyName == wxT("PID")){
-
-			LogosListPID.erase(*LogoCount);
-			LogosListPID.insert(std::make_pair(*LogoCount, PropertyValue));
+		ProcessStringValue(&PropertyName, "ALTID", &LogosListAltID, &PropertyValue, LogoCount, &PropertyMatched);
+		ProcessStringValue(&PropertyName, "PID", &LogosListPID, &PropertyValue, LogoCount, &PropertyMatched);
+		ProcessStringValue(&PropertyName, "MEDIATYPE", &LogosListMediatype, &PropertyValue, LogoCount, &PropertyMatched);
+		ProcessIntegerValue(&PropertyName, "PREF", &LogosListPref, &PropertyValue, LogoCount, &PropertyMatched);
 		
-		} else if (PropertyName == wxT("PREF")){
-
-			ProcessIntegerValue(this, &LogosListPref, &PropertyValue, LogoCount);
+		if (PropertyMatched == TRUE){
 		
-		} else if (PropertyName == wxT("MEDIATYPE")){
+			PropertyMatched = FALSE;
+			continue;
 		
-			LogosListMediatype.erase(*LogoCount);
-			LogosListMediatype.insert(std::make_pair(*LogoCount, PropertyValue));
-					
-		} else {
+		}
+
+		if (!PropertyName.IsEmpty() && !PropertyValue.IsEmpty() && PropertyName != wxT("TYPE")){
 		
-			// Something else we don't know about so append
-			// to the tokens variable.
+			if (FirstToken == TRUE){
 			
-			if (!PropertyName.IsEmpty() && !PropertyValue.IsEmpty() && PropertyName != wxT("TYPE")){
+				PropertyTokens.Append(PropertyName + wxT("=") + PropertyValue);
+				FirstToken = FALSE;
 			
-				if (FirstToken == TRUE){
-				
-					PropertyTokens.Append(PropertyName + wxT("=") + PropertyValue);
-					FirstToken = FALSE;
-				
-				} else {
-				
-					PropertyTokens.Append(wxT(";") + PropertyName + wxT("=") + PropertyValue);
-				
-				}
+			} else {
+			
+				PropertyTokens.Append(wxT(";") + PropertyName + wxT("=") + PropertyValue);
 			
 			}
 		
@@ -4660,6 +4382,7 @@ void ContactDataObject::ProcessSound(wxString PropertySeg1, wxString PropertySeg
 	CheckType(&PropertySeg1, &SplitPoints, &SplitLength, &intPrevValue, &PropType);
 
 	intPrevValue = 6;
+	bool PropertyMatched = FALSE;
 
 	for (std::map<int, int>::iterator intiter = SplitPoints.begin(); 
 	intiter != SplitPoints.end(); ++intiter){
@@ -4693,47 +4416,29 @@ void ContactDataObject::ProcessSound(wxString PropertySeg1, wxString PropertySeg
 		
 		CaptureString(&PropertyValue, FALSE);
 		
-		if (PropertyName == wxT("ALTID")){
-
-			SoundsListAltID.erase(*SoundCount);
-			SoundsListAltID.insert(std::make_pair(*SoundCount, PropertyValue));
-		
-		} else if (PropertyName == wxT("PID")){
-
-			SoundsListPID.erase(*SoundCount);
-			SoundsListPID.insert(std::make_pair(*SoundCount, PropertyValue));
-		
-		} else if (PropertyName == wxT("PREF")){
-
-			ProcessIntegerValue(this, &SoundsListPref, &PropertyValue, SoundCount);
+		ProcessStringValue(&PropertyName, "ALTID", &SoundsListAltID, &PropertyValue, SoundCount, &PropertyMatched);
+		ProcessStringValue(&PropertyName, "PID", &SoundsListPID, &PropertyValue, SoundCount, &PropertyMatched);
+		ProcessStringValue(&PropertyName, "MEDIATYPE", &SoundsListMediatype, &PropertyValue, SoundCount, &PropertyMatched);
+		ProcessStringValue(&PropertyName, "LANGUAGE", &SoundsListLanguage, &PropertyValue, SoundCount, &PropertyMatched);
+		ProcessIntegerValue(&PropertyName, "PREF", &SoundsListPref, &PropertyValue, SoundCount, &PropertyMatched);
 		
-		} else if (PropertyName == wxT("MEDIATYPE")){
+		if (PropertyMatched == TRUE){
 		
-			SoundsListMediatype.erase(*SoundCount);
-			SoundsListMediatype.insert(std::make_pair(*SoundCount, PropertyValue));
-
-		} else if (PropertyName == wxT("LANGUAGE")){
+			PropertyMatched = FALSE;
+			continue;
 		
-			SoundsListLanguage.erase(*SoundCount);
-			SoundsListLanguage.insert(std::make_pair(*SoundCount, PropertyValue));
+		}
 
-		} else {
+		if (!PropertyName.IsEmpty() && !PropertyValue.IsEmpty() && PropertyName != wxT("TYPE")){
 		
-			// Something else we don't know about so append
-			// to the tokens variable.
+			if (FirstToken == TRUE){
 			
-			if (!PropertyName.IsEmpty() && !PropertyValue.IsEmpty() && PropertyName != wxT("TYPE")){
+				PropertyTokens.Append(PropertyName + wxT("=") + PropertyValue);
+				FirstToken = FALSE;
 			
-				if (FirstToken == TRUE){
-				
-					PropertyTokens.Append(PropertyName + wxT("=") + PropertyValue);
-					FirstToken = FALSE;
-				
-				} else {
-				
-					PropertyTokens.Append(wxT(";") + PropertyName + wxT("=") + PropertyValue);
-				
-				}
+			} else {
+			
+				PropertyTokens.Append(wxT(";") + PropertyName + wxT("=") + PropertyValue);
 			
 			}
 		
@@ -4866,6 +4571,7 @@ void ContactDataObject::ProcessCalendarURI(wxString PropertySeg1, wxString Prope
 	CheckType(&PropertySeg1, &SplitPoints, &SplitLength, &intPrevValue, &PropType);
 
 	intPrevValue = 7;
+	bool PropertyMatched = FALSE;
 
 	for (std::map<int, int>::iterator intiter = SplitPoints.begin(); 
 	intiter != SplitPoints.end(); ++intiter){
@@ -4899,42 +4605,28 @@ void ContactDataObject::ProcessCalendarURI(wxString PropertySeg1, wxString Prope
 		
 		CaptureString(&PropertyValue, FALSE);
 		
-		if (PropertyName == wxT("ALTID")){
-
-			CalendarListAltID.erase(*CalURICount);
-			CalendarListAltID.insert(std::make_pair(*CalURICount, PropertyValue));
-		
-		} else if (PropertyName == wxT("PID")){
-
-			CalendarListPID.erase(*CalURICount);
-			CalendarListPID.insert(std::make_pair(*CalURICount, PropertyValue));
+		ProcessStringValue(&PropertyName, "ALTID", &CalendarListAltID, &PropertyValue, CalURICount, &PropertyMatched);
+		ProcessStringValue(&PropertyName, "PID", &CalendarListPID, &PropertyValue, CalURICount, &PropertyMatched);
+		ProcessStringValue(&PropertyName, "MEDIATYPE", &CalendarListMediatype, &PropertyValue, CalURICount, &PropertyMatched);
+		ProcessIntegerValue(&PropertyName, "PREF", &CalendarListPref, &PropertyValue, CalURICount, &PropertyMatched);
 		
-		} else if (PropertyName == wxT("PREF")){
-
-			ProcessIntegerValue(this, &CalendarListPref, &PropertyValue, CalURICount);
+		if (PropertyMatched == TRUE){
 		
-		} else if (PropertyName == wxT("MEDIATYPE")){
+			PropertyMatched = FALSE;
+			continue;
 		
-			CalendarListMediatype.erase(*CalURICount);
-			CalendarListMediatype.insert(std::make_pair(*CalURICount, PropertyValue));
+		}
 
-		} else {
+		if (!PropertyName.IsEmpty() && !PropertyValue.IsEmpty() && PropertyName != wxT("TYPE")){
 		
-			// Something else we don't know about so append
-			// to the tokens variable.
+			if (FirstToken == TRUE){
 			
-			if (!PropertyName.IsEmpty() && !PropertyValue.IsEmpty() && PropertyName != wxT("TYPE")){
+				PropertyTokens.Append(PropertyName + wxT("=") + PropertyValue);
+				FirstToken = FALSE;
 			
-				if (FirstToken == TRUE){
-				
-					PropertyTokens.Append(PropertyName + wxT("=") + PropertyValue);
-					FirstToken = FALSE;
-				
-				} else {
-				
-					PropertyTokens.Append(wxT(";") + PropertyName + wxT("=") + PropertyValue);
-				
-				}
+			} else {
+			
+				PropertyTokens.Append(wxT(";") + PropertyName + wxT("=") + PropertyValue);
 			
 			}
 		
@@ -5002,6 +4694,7 @@ void ContactDataObject::ProcessCalendarAddressURI(wxString PropertySeg1, wxStrin
 	CheckType(&PropertySeg1, &SplitPoints, &SplitLength, &intPrevValue, &PropType);
 
 	intPrevValue = 7;
+	bool PropertyMatched = FALSE;
 
 	for (std::map<int, int>::iterator intiter = SplitPoints.begin(); 
 	intiter != SplitPoints.end(); ++intiter){
@@ -5035,42 +4728,28 @@ void ContactDataObject::ProcessCalendarAddressURI(wxString PropertySeg1, wxStrin
 		
 		CaptureString(&PropertyValue, FALSE);
 		
-		if (PropertyName == wxT("ALTID")){
-
-			CalendarRequestListAltID.erase(*CalAdrURICount);
-			CalendarRequestListAltID.insert(std::make_pair(*CalAdrURICount, PropertyValue));
-		
-		} else if (PropertyName == wxT("PID")){
-
-			CalendarRequestListPID.erase(*CalAdrURICount);
-			CalendarRequestListPID.insert(std::make_pair(*CalAdrURICount, PropertyValue));
+		ProcessStringValue(&PropertyName, "ALTID", &CalendarRequestListAltID, &PropertyValue, CalAdrURICount, &PropertyMatched);
+		ProcessStringValue(&PropertyName, "PID", &CalendarRequestListPID, &PropertyValue, CalAdrURICount, &PropertyMatched);
+		ProcessStringValue(&PropertyName, "MEDIATYPE", &CalendarRequestListMediatype, &PropertyValue, CalAdrURICount, &PropertyMatched);
+		ProcessIntegerValue(&PropertyName, "PREF", &CalendarRequestListPref, &PropertyValue, CalAdrURICount, &PropertyMatched);
 		
-		} else if (PropertyName == wxT("PREF")){
-
-			ProcessIntegerValue(this, &CalendarRequestListPref, &PropertyValue, CalAdrURICount);
+		if (PropertyMatched == TRUE){
 		
-		} else if (PropertyName == wxT("MEDIATYPE")){
+			PropertyMatched = FALSE;
+			continue;
 		
-			CalendarRequestListMediatype.erase(*CalAdrURICount);
-			CalendarRequestListMediatype.insert(std::make_pair(*CalAdrURICount, PropertyValue));
+		}
 
-		} else {
+		if (!PropertyName.IsEmpty() && !PropertyValue.IsEmpty() && PropertyName != wxT("TYPE")){
 		
-			// Something else we don't know about so append
-			// to the tokens variable.
+			if (FirstToken == TRUE){
 			
-			if (!PropertyName.IsEmpty() && !PropertyValue.IsEmpty() && PropertyName != wxT("TYPE")){
+				PropertyTokens.Append(PropertyName + wxT("=") + PropertyValue);
+				FirstToken = FALSE;
 			
-				if (FirstToken == TRUE){
-				
-					PropertyTokens.Append(PropertyName + wxT("=") + PropertyValue);
-					FirstToken = FALSE;
-				
-				} else {
-				
-					PropertyTokens.Append(wxT(";") + PropertyName + wxT("=") + PropertyValue);
-				
-				}
+			} else {
+			
+				PropertyTokens.Append(wxT(";") + PropertyName + wxT("=") + PropertyValue);
 			
 			}
 		
@@ -5138,6 +4817,7 @@ void ContactDataObject::ProcessCalendarFreeBusy(wxString PropertySeg1, wxString
 	CheckType(&PropertySeg1, &SplitPoints, &SplitLength, &intPrevValue, &PropType);
 
 	intPrevValue = 6;
+	bool PropertyMatched = FALSE;
 
 	for (std::map<int, int>::iterator intiter = SplitPoints.begin(); 
 	intiter != SplitPoints.end(); ++intiter){
@@ -5171,42 +4851,28 @@ void ContactDataObject::ProcessCalendarFreeBusy(wxString PropertySeg1, wxString
 		
 		CaptureString(&PropertyValue, FALSE);
 		
-		if (PropertyName == wxT("ALTID")){
-
-			FreeBusyListAltID.erase(*FreeBusyAddressCount);
-			FreeBusyListAltID.insert(std::make_pair(*FreeBusyAddressCount, PropertyValue));
+		ProcessStringValue(&PropertyName, "ALTID", &FreeBusyListAltID, &PropertyValue, FreeBusyAddressCount, &PropertyMatched);
+		ProcessStringValue(&PropertyName, "PID", &FreeBusyListPID, &PropertyValue, FreeBusyAddressCount, &PropertyMatched);
+		ProcessStringValue(&PropertyName, "MEDIATYPE", &FreeBusyListMediatype, &PropertyValue, FreeBusyAddressCount, &PropertyMatched);
+		ProcessIntegerValue(&PropertyName, "PREF", &FreeBusyListPref, &PropertyValue, FreeBusyAddressCount, &PropertyMatched);
 		
-		} else if (PropertyName == wxT("PID")){
-
-			FreeBusyListPID.erase(*FreeBusyAddressCount);
-			FreeBusyListPID.insert(std::make_pair(*FreeBusyAddressCount, PropertyValue));
+		if (PropertyMatched == TRUE){
 		
-		} else if (PropertyName == wxT("PREF")){
-
-			ProcessIntegerValue(this, &FreeBusyListPref, &PropertyValue, FreeBusyAddressCount);
-		
-		} else if (PropertyName == wxT("MEDIATYPE")){
+			PropertyMatched = FALSE;
+			continue;
 		
-			FreeBusyListMediatype.erase(*FreeBusyAddressCount);
-			FreeBusyListMediatype.insert(std::make_pair(*FreeBusyAddressCount, PropertyValue));
+		}
 
-		} else {
+		if (!PropertyName.IsEmpty() && !PropertyValue.IsEmpty() && PropertyName != wxT("TYPE")){
 		
-			// Something else we don't know about so append
-			// to the tokens variable.
+			if (FirstToken == TRUE){
 			
-			if (!PropertyName.IsEmpty() && !PropertyValue.IsEmpty() && PropertyName != wxT("TYPE")){
+				PropertyTokens.Append(PropertyName + wxT("=") + PropertyValue);
+				FirstToken = FALSE;
 			
-				if (FirstToken == TRUE){
-				
-					PropertyTokens.Append(PropertyName + wxT("=") + PropertyValue);
-					FirstToken = FALSE;
-				
-				} else {
-				
-					PropertyTokens.Append(wxT(";") + PropertyName + wxT("=") + PropertyValue);
-				
-				}
+			} else {
+			
+				PropertyTokens.Append(wxT(";") + PropertyName + wxT("=") + PropertyValue);
 			
 			}
 		
@@ -5275,6 +4941,7 @@ void ContactDataObject::ProcessKey(wxString PropertySeg1, wxString PropertySeg2,
 	CheckType(&PropertySeg1, &SplitPoints, &SplitLength, &intPrevValue, &PropType);
 
 	intPrevValue = 4;
+	bool PropertyMatched = FALSE;
 
 	for (std::map<int, int>::iterator intiter = SplitPoints.begin(); 
 	intiter != SplitPoints.end(); ++intiter){
@@ -5304,55 +4971,29 @@ void ContactDataObject::ProcessKey(wxString PropertySeg1, wxString PropertySeg2,
 			
 			PropertyValue.Remove(0, 1);
 			
-		}				
+		}
 		
-		if (PropertyName == wxT("ALTID")){
-
-			KeyListAltID.erase(*KeyCount);
-			KeyListAltID.insert(std::make_pair(*KeyCount, PropertyValue));
+		ProcessStringValue(&PropertyName, "ALTID", &KeyListAltID, &PropertyValue, KeyCount, &PropertyMatched);
+		ProcessStringValue(&PropertyName, "PID", &KeyListPID, &PropertyValue, KeyCount, &PropertyMatched);
+		ProcessIntegerValue(&PropertyName, "PREF", &KeyListPref, &PropertyValue, KeyCount, &PropertyMatched);
 		
-		} else if (PropertyName == wxT("PID")){
-
-			KeyListPID.erase(*KeyCount);
-			KeyListPID.insert(std::make_pair(*KeyCount, PropertyValue));
+		if (PropertyMatched == TRUE){
 		
-		} 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));
-
-			}
+			PropertyMatched = FALSE;
+			continue;
 		
-		} else {
+		}
+
+		if (!PropertyName.IsEmpty() && !PropertyValue.IsEmpty() && PropertyName != wxT("TYPE")){
 		
-			// Something else we don't know about so append
-			// to the tokens variable.
+			if (FirstToken == TRUE){
 			
-			if (!PropertyName.IsEmpty() && !PropertyValue.IsEmpty() && PropertyName != wxT("TYPE")){
+				PropertyTokens.Append(PropertyName + wxT("=") + PropertyValue);
+				FirstToken = FALSE;
 			
-				if (FirstToken == TRUE){
-				
-					PropertyTokens.Append(PropertyName + wxT("=") + PropertyValue);
-					FirstToken = FALSE;
-				
-				} else {
-				
-					PropertyTokens.Append(wxT(";") + PropertyName + wxT("=") + PropertyValue);
-				
-				}
+			} else {
+			
+				PropertyTokens.Append(wxT(";") + PropertyName + wxT("=") + PropertyValue);
 			
 			}
 		
@@ -5508,10 +5149,55 @@ void ContactDataObject::ProcessVendor(wxString PropertySeg1, wxString PropertySe
 
 }
 
-void ProcessIntegerValue(ContactDataObject *ContactData,
+void ProcessTokens(wxString *PropertyName,
+	wxString *PropertyValue,
+	wxString *PropertyTokens,
+	bool *FirstToken){
+	
+	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);
+			
+		}
+		
+	}
+	
+}
+
+void ProcessStringValue(wxString *PropertyName,
+	wxString PropertyNameMatch,
+	std::map<int,wxString> *MapPtr,
+	wxString *PropertyValue,
+	int *ItemCount,
+	bool *PropertyMatched){
+	
+	if (*PropertyName == PropertyNameMatch){
+		MapPtr->erase(*ItemCount);
+		MapPtr->insert(std::make_pair(*ItemCount, *PropertyValue));
+		*PropertyMatched = TRUE;
+	}
+	
+}
+
+void ProcessIntegerValue(wxString *PropertyName,
+	wxString PropertyNameMatch,
 	std::map<int,int> *PrefPtr, 
 	wxString *PropertyValue, 
-	int *ItemCount){
+	int *ItemCount,
+	bool *PropertyMatched){
+
+	if (*PropertyName == PropertyNameMatch){
+		*PropertyMatched = TRUE;
+	} else {
+		return;
+	}
 
 	int PriorityNumber = 0;	
 	bool ValidNumber = TRUE;