X-Git-Url: http://Server1/repobrowser/?a=blobdiff_plain;f=source%2Fcontacteditor%2FContactDataObject.cpp;h=245341be5d81c0bc64588103f7491b7e59c949e2;hb=ad76a9933d9cfcee0abe970c996a944b56e3caf8;hp=fab6aafed9c5b2ff7380ca175010d6705276d39b;hpb=749c51c25f73a4bc2c1a8161168b8fa07de2a045;p=xestiaab%2F.git

diff --git a/source/contacteditor/ContactDataObject.cpp b/source/contacteditor/ContactDataObject.cpp
index fab6aaf..245341b 100644
--- a/source/contacteditor/ContactDataObject.cpp
+++ b/source/contacteditor/ContactDataObject.cpp
@@ -1625,6 +1625,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){
@@ -1641,45 +1642,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(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);
 		
 			}
-		
+	
 		}
 		
 	}
@@ -1731,6 +1718,7 @@ void ContactDataObject::ProcessAddress(wxString PropertySeg1, wxString PropertyS
 	int intPref = 0;			
 	int intType = 0;
 	long ListCtrlIndex;
+	bool PropertyMatched = FALSE;
 	
 	SplitValues(&PropertySeg1, &SplitPoints, &SplitLength, intPrevValue);
 	
@@ -1833,62 +1821,35 @@ void ContactDataObject::ProcessAddress(wxString PropertySeg1, wxString PropertyS
 		
 		// Process properties.
 		
-		if (PropertyName == wxT("LABEL")){
+		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);
 		
-			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));
+		if (PropertyMatched == TRUE){
 		
-		} else if (PropertyName == wxT("MEDIATYPE")){
-
-			AddressListMediatype->erase(*AddressCount);
-			AddressListMediatype->insert(std::make_pair(*AddressCount, PropertyValue));
+			PropertyMatched = FALSE;
+			continue;
 		
-		} else if (PropertyName == wxT("PREF")){
-
-			ProcessIntegerValue(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);
 			
 			}
-		
+			
 		}
 	
 	}			
@@ -1940,7 +1901,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;
 		
@@ -1951,7 +1911,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){
@@ -1961,7 +1920,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){
@@ -1971,10 +1929,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){
 		
@@ -1983,10 +1938,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){
 		
@@ -1995,14 +1948,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;
 		
 		}
@@ -2105,6 +2056,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){
@@ -2123,37 +2075,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(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);
 			
 			}
-		
+			
 		}
 	
 	}
@@ -2235,6 +2180,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){
@@ -2251,41 +2197,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(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);
 			
 			}
 		
@@ -2535,6 +2470,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){
 	
@@ -2552,34 +2489,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(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);
 			
 			}
 		
@@ -2660,6 +2590,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){
@@ -2678,34 +2609,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(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);
 			
 			}
 		
@@ -2789,6 +2713,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){
@@ -2807,39 +2732,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(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);
 			
 			}
 		
@@ -2996,6 +2910,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){
 	
@@ -3028,60 +2944,31 @@ void ContactDataObject::ProcessRelated(wxString PropertySeg1, wxString PropertyS
 		
 		CaptureString(&PropertyValue, FALSE);
 			
-		if (PropertyName == wxT("ALTID")){
+		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);
 
-			GeneralRelatedListAltID.erase(*RelatedCount);
-			GeneralRelatedListAltID.insert(std::make_pair(*RelatedCount, PropertyValue));
-		
-		} else if (PropertyName == wxT("PID")){
-
-			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(&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);
 		
 			}
-		
+	
 		}
 	
 	}					
@@ -3167,6 +3054,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){
@@ -3200,45 +3088,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(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);
 		
+			}
+	
 		}
 	
 	}
@@ -3325,6 +3199,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){
@@ -3358,45 +3233,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(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);
 		
 			}
-		
+	
 		}
 	
 	}
@@ -3483,6 +3344,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){
@@ -3516,47 +3378,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(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.