X-Git-Url: http://Server1/repobrowser/?a=blobdiff_plain;f=source%2Fcontacteditor%2FContactDataObject.cpp;h=85b1320400ff3008eb98fb8b82b7df7ef7caf135;hb=ff455de2184e73bd33a2e706665ed0dec81cb5e4;hp=ec9a03d03a7d8780d4f4712b9fd31412ee999240;hpb=4a40989643e36ab0e1cd71cffcb6410704e1ee6d;p=xestiaab%2F.git

diff --git a/source/contacteditor/ContactDataObject.cpp b/source/contacteditor/ContactDataObject.cpp
index ec9a03d..85b1320 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);
 	
 	}	
 	
@@ -612,20 +603,7 @@ void ContactDataObject::ProcessSource(wxString PropertySeg1, wxString PropertySe
 		
 		}
 		
-		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);
-			
-			}
-		
-		}
+		ProcessTokens(&PropertyName, &PropertyValue, &PropertyTokens, &FirstToken);
 	
 	}	
 	
@@ -760,20 +738,7 @@ void ContactDataObject::ProcessMember(wxString PropertySeg1, wxString PropertySe
 		
 		}
 		
-		if (!PropertyName.IsEmpty() && !PropertyValue.IsEmpty()){
-			
-			if (FirstToken == TRUE){
-				
-				PropertyTokens.Append(PropertyName + wxT("=") + PropertyValue);
-				FirstToken = FALSE;
-				
-			} else {
-			
-				PropertyTokens.Append(wxT(";") + PropertyName + wxT("=") + PropertyValue);
-				
-			}
-			
-		}
+		ProcessTokens(&PropertyName, &PropertyValue, &PropertyTokens, &FirstToken);
 		
 	}
 
@@ -850,20 +815,7 @@ void ContactDataObject::ProcessFN(wxString PropertySeg1, wxString PropertySeg2,
 		
 		}
 		
-		if (!PropertyName.IsEmpty() && !PropertyValue.IsEmpty()){
-			
-			if (FirstToken == TRUE){
-				
-				PropertyTokens.Append(PropertyName + wxT("=") + PropertyValue);
-				FirstToken = FALSE;
-				
-			} else {
-			
-				PropertyTokens.Append(wxT(";") + PropertyName + wxT("=") + PropertyValue);
-				
-			}
-			
-		} 
+		ProcessTokens(&PropertyName, &PropertyValue, &PropertyTokens, &FirstToken);
 	
 	}
 
@@ -929,16 +881,7 @@ void ContactDataObject::ProcessN(wxString PropertySeg1, wxString PropertySeg2){
 		
 		} else if (!PropertyName.IsEmpty() && !PropertyValue.IsEmpty()){
 			
-			if (FirstToken == TRUE){
-				
-				PropertyTokens.Append(PropertyName + wxT("=") + PropertyValue);
-				FirstToken = FALSE;
-				
-			} else {
-			
-				PropertyTokens.Append(wxT(";") + PropertyName + wxT("=") + PropertyValue);
-				
-			}
+			ProcessTokens(&PropertyName, &PropertyValue, &PropertyTokens, &FirstToken);
 			
 		}
 	
@@ -1070,20 +1013,7 @@ void ContactDataObject::ProcessClientPIDMap(wxString PropertySeg1, wxString Prop
 				
 		CaptureString(&PropertyValue, FALSE);
 					
-		if (!PropertyName.IsEmpty() && !PropertyValue.IsEmpty()){
-							
-			if (FirstToken == TRUE){
-				
-				PropertyTokens.Append(PropertyName + wxT("=") + PropertyValue);
-				FirstToken = FALSE;
-				
-			} else {
-				
-				PropertyTokens.Append(wxT(";") + PropertyName + wxT("=") + PropertyValue);
-				
-			}
-		
-		}
+		ProcessTokens(&PropertyName, &PropertyValue, &PropertyTokens, &FirstToken);
 	
 	}	
 	
@@ -1192,20 +1122,7 @@ void ContactDataObject::ProcessNickname(wxString PropertySeg1, wxString Property
 		
 		}
 		
-		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);
-		
-			}
-	
-		}
+		ProcessTokens(&PropertyName, &PropertyValue, &PropertyTokens, &FirstToken);
 		
 	}
 	
@@ -1267,20 +1184,7 @@ void ContactDataObject::ProcessGender(wxString PropertySeg1, wxString PropertySe
 			
 		}				
 		
-		if (!PropertyName.IsEmpty() && !PropertyValue.IsEmpty()){
-
-			if (FirstToken == TRUE){
-	
-				PropertyTokens.Append(PropertyName + wxT("=") + PropertyValue);
-				FirstToken = FALSE;
-	
-			} else {
-	
-				PropertyTokens.Append(wxT(";") + PropertyName + wxT("=") + PropertyValue);
-	
-			}
-
-		}
+		ProcessTokens(&PropertyName, &PropertyValue, &PropertyTokens, &FirstToken);
 	
 	}	
 
@@ -1400,20 +1304,7 @@ void ContactDataObject::ProcessBirthday(wxString PropertySeg1, wxString Property
 			// Something else we don't know about so append
 			// to the tokens variable.
 		
-			if (!PropertyName.IsEmpty() && !PropertyValue.IsEmpty()){
-		
-				if (FirstToken == TRUE){
-	
-					PropertyTokens.Append(PropertyName + wxT("=") + PropertyValue);
-					FirstToken = FALSE;
-	
-				} else {
-	
-					PropertyTokens.Append(wxT(";") + PropertyName + wxT("=") + PropertyValue);
-	
-				}
-				
-			}
+			ProcessTokens(&PropertyName, &PropertyValue, &PropertyTokens, &FirstToken);
 			
 		}
 
@@ -1526,20 +1417,7 @@ void ContactDataObject::ProcessAnniversary(wxString PropertySeg1, wxString Prope
 			// Something else we don't know about so append
 			// to the tokens variable.
 		
-			if (!PropertyName.IsEmpty() && !PropertyValue.IsEmpty()){
-		
-				if (FirstToken == TRUE){
-	
-					PropertyTokens.Append(PropertyName + wxT("=") + PropertyValue);
-					FirstToken = FALSE;
-	
-				} else {
-	
-					PropertyTokens.Append(wxT(";") + PropertyName + wxT("=") + PropertyValue);
-	
-				}
-				
-			}
+			ProcessTokens(&PropertyName, &PropertyValue, &PropertyTokens, &FirstToken);
 			
 		}
 
@@ -1656,16 +1534,7 @@ void ContactDataObject::ProcessTimeZone(wxString PropertySeg1, wxString Property
 
 		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);
-		
-			}
+			ProcessTokens(&PropertyName, &PropertyValue, &PropertyTokens, &FirstToken);
 	
 		}
 		
@@ -1837,20 +1706,7 @@ void ContactDataObject::ProcessAddress(wxString PropertySeg1, wxString PropertyS
 		
 		}
 		
-		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);
-			
-			}
-			
-		}
+		ProcessTokens(&PropertyName, &PropertyValue, &PropertyTokens, &FirstToken);
 	
 	}			
 	
@@ -2086,20 +1942,7 @@ void ContactDataObject::ProcessEmail(wxString PropertySeg1, wxString PropertySeg
 		
 		}
 		
-		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);
-			
-			}
-			
-		}
+		ProcessTokens(&PropertyName, &PropertyValue, &PropertyTokens, &FirstToken);
 	
 	}
 	
@@ -2211,20 +2054,7 @@ void ContactDataObject::ProcessIM(wxString PropertySeg1, wxString PropertySeg2,
 		
 		}
 		
-		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);
-			
-			}
-		
-		}
+		ProcessTokens(&PropertyName, &PropertyValue, &PropertyTokens, &FirstToken);
 	
 	}
 		
@@ -2500,20 +2330,7 @@ void ContactDataObject::ProcessTelephone(wxString PropertySeg1, wxString Propert
 		
 		}
 
-		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);
-			
-			}
-		
-		}
+		ProcessTokens(&PropertyName, &PropertyValue, &PropertyTokens, &FirstToken);
 	
 	}
 		
@@ -2620,20 +2437,7 @@ void ContactDataObject::ProcessLanguage(wxString PropertySeg1, wxString Property
 		
 		}
 		
-		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);
-			
-			}
-		
-		}
+		ProcessTokens(&PropertyName, &PropertyValue, &PropertyTokens, &FirstToken);
 	
 	}
 		
@@ -2744,20 +2548,7 @@ void ContactDataObject::ProcessGeographic(wxString PropertySeg1, wxString Proper
 		
 		}
 		
-		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);
-			
-			}
-		
-		}
+		ProcessTokens(&PropertyName, &PropertyValue, &PropertyTokens, &FirstToken);
 	
 	}
 		
@@ -2956,20 +2747,7 @@ void ContactDataObject::ProcessRelated(wxString PropertySeg1, wxString PropertyS
 		
 		}
 
-		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);
-		
-			}
-	
-		}
+		ProcessTokens(&PropertyName, &PropertyValue, &PropertyTokens, &FirstToken);
 	
 	}					
 	
@@ -3054,6 +2832,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){
@@ -3087,46 +2866,19 @@ void ContactDataObject::ProcessURL(wxString PropertySeg1, wxString PropertySeg2,
 		
 		CaptureString(&PropertyValue, FALSE);
 		
-		if (PropertyName == wxT("ALTID")){
-
-			WebsiteListAltID->erase(*URLCount);
-			WebsiteListAltID->insert(std::make_pair(*URLCount, PropertyValue));
-		
-		} 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")){
-		
-			WebsiteListMediatype->erase(*URLCount);
-			WebsiteListMediatype->insert(std::make_pair(*URLCount, PropertyValue));
-		
-		} else {
-		
-			// Something else we don't know about so append
-			// to the tokens variable.
-		
-			if (!PropertyName.IsEmpty() && !PropertyValue.IsEmpty() && PropertyName != wxT("TYPE")){
+		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);
 		
-				if (FirstToken == TRUE){
-			
-					PropertyTokens.Append(PropertyName + wxT("=") + PropertyValue);
-					FirstToken = FALSE;
-			
-				} else {
-			
-					PropertyTokens.Append(wxT(";") + PropertyName + wxT("=") + PropertyValue);
-			
-				}
+		if (PropertyMatched == TRUE){
 		
-			}
+			PropertyMatched = FALSE;
+			continue;
 		
 		}
+		
+		ProcessTokens(&PropertyName, &PropertyValue, &PropertyTokens, &FirstToken);
 	
 	}
 	
@@ -3212,6 +2964,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){
@@ -3245,46 +2998,19 @@ void ContactDataObject::ProcessTitle(wxString PropertySeg1, wxString PropertySeg
 		
 		CaptureString(&PropertyValue, FALSE);
 		
-		if (PropertyName == wxT("ALTID")){
-		
-			TitleListAltID->erase(*TitleCount);
-			TitleListAltID->insert(std::make_pair(*TitleCount, PropertyValue));
+		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);
 		
-		} else if (PropertyName == wxT("PID")){
-
-			TitleListPID->erase(*TitleCount);
-			TitleListPID->insert(std::make_pair(*TitleCount, PropertyValue));
-		
-		} 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 {
-		
-			// Something else we don't know about so append
-			// to the tokens variable.
-		
-			if (!PropertyName.IsEmpty() && !PropertyValue.IsEmpty() && PropertyName != wxT("TYPE")){
-		
-				if (FirstToken == TRUE){
-			
-					PropertyTokens.Append(PropertyName + wxT("=") + PropertyValue);
-					FirstToken = FALSE;
-			
-				} else {
-			
-					PropertyTokens.Append(wxT(";") + PropertyName + wxT("=") + PropertyValue);
-			
-				}
+		if (PropertyMatched == TRUE){
 		
-			}
+			PropertyMatched = FALSE;
+			continue;
 		
 		}
+
+		ProcessTokens(&PropertyName, &PropertyValue, &PropertyTokens, &FirstToken);
 	
 	}
 	
@@ -3370,6 +3096,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){
@@ -3403,47 +3130,20 @@ void ContactDataObject::ProcessRole(wxString PropertySeg1, wxString PropertySeg2
 		
 		CaptureString(&PropertyValue, FALSE);
 		
-		if (PropertyName == wxT("ALTID")){
-		
-			RoleListAltID->erase(*RoleCount);
-			RoleListAltID->insert(std::make_pair(*RoleCount, PropertyValue));
-		
-		} else if (PropertyName == wxT("PID")){
-
-			RoleListPID->erase(*RoleCount);
-			RoleListPID->insert(std::make_pair(*RoleCount, PropertyValue));
-		
-		} else if (PropertyName == wxT("PREF")){
-
-			ProcessIntegerValue(RoleListPref, &PropertyValue, RoleCount);
-				
-		} else if (PropertyName == wxT("LANGUAGE")){
-		
-			RoleListLanguage->erase(*RoleCount);
-			RoleListLanguage->insert(std::make_pair(*RoleCount, PropertyValue));
-		
-		} else {
+		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);
 		
-			// Something else we don't know about so append
-			// to the tokens variable.
+		if (PropertyMatched == TRUE){
 		
-			if (!PropertyName.IsEmpty() && !PropertyValue.IsEmpty() && PropertyName != wxT("TYPE")){
+			PropertyMatched = FALSE;
+			continue;
 		
-				if (FirstToken == TRUE){
-			
-					PropertyTokens.Append(PropertyName + wxT("=") + PropertyValue);
-					FirstToken = FALSE;
-			
-				} else {
-			
-					PropertyTokens.Append(wxT(";") + PropertyName + wxT("=") + PropertyValue);
-			
-				}
+		}
 		
-			}
+		ProcessTokens(&PropertyName, &PropertyValue, &PropertyTokens, &FirstToken);
 		
-		}
-	
 	}
 	
 	// Add the data to the General/Home/Work address variables.
@@ -3532,6 +3232,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){
@@ -3565,52 +3266,21 @@ void ContactDataObject::ProcessOrganisation(wxString PropertySeg1, wxString Prop
 		
 		CaptureString(&PropertyValue, FALSE);
 		
-		if (PropertyName == wxT("ALTID")){
+		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);
 		
-			OrganisationsListAltID->erase(*OrganisationCount);
-			OrganisationsListAltID->insert(std::make_pair(*OrganisationCount, PropertyValue));
+		if (PropertyMatched == TRUE){
 		
-		} else if (PropertyName == wxT("PID")){
-
-			OrganisationsListPID->erase(*OrganisationCount);
-			OrganisationsListPID->insert(std::make_pair(*OrganisationCount, PropertyValue));
+			PropertyMatched = FALSE;
+			continue;
 		
-		} else if (PropertyName == wxT("SORT-AS")){
-
-			OrganisationsListSortAs->erase(*OrganisationCount);
-			OrganisationsListSortAs->insert(std::make_pair(*OrganisationCount, PropertyValue));
+		}
 		
-		} else if (PropertyName == wxT("PREF")){
+		ProcessTokens(&PropertyName, &PropertyValue, &PropertyTokens, &FirstToken);
 
-			ProcessIntegerValue(OrganisationsListPref, &PropertyValue, OrganisationCount);
-			
-		} else if (PropertyName == wxT("LANGUAGE")){
-		
-			OrganisationsListLanguage->erase(*OrganisationCount);
-			OrganisationsListLanguage->insert(std::make_pair(*OrganisationCount, PropertyValue));
-		
-		} else {
-		
-			// Something else we don't know about so append
-			// to the tokens variable.
-		
-			if (!PropertyName.IsEmpty() && !PropertyValue.IsEmpty() && PropertyName != wxT("TYPE")){
-		
-				if (FirstToken == TRUE){
-			
-					PropertyTokens.Append(PropertyName + wxT("=") + PropertyValue);
-					FirstToken = FALSE;
-			
-				} else {
-			
-					PropertyTokens.Append(wxT(";") + PropertyName + wxT("=") + PropertyValue);
-			
-				}
-		
-			}
-		
-		}
-	
 	}
 	
 	// Add the data to the General/Home/Work address variables.
@@ -3695,6 +3365,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){
@@ -3728,46 +3399,19 @@ void ContactDataObject::ProcessNote(wxString PropertySeg1, wxString PropertySeg2
 		
 		CaptureString(&PropertyValue, FALSE);
 		
-		if (PropertyName == wxT("ALTID")){
-		
-			NoteListAltID->erase(*NoteCount);
-			NoteListAltID->insert(std::make_pair(*NoteCount, PropertyValue));
-		
-		} else if (PropertyName == wxT("PID")){
-
-			NoteListPID->erase(*NoteCount);
-			NoteListPID->insert(std::make_pair(*NoteCount, PropertyValue));
-		
-		} else if (PropertyName == wxT("PREF")){
-
-			ProcessIntegerValue(NoteListPref, &PropertyValue, NoteCount);
-		
-		} else if (PropertyName == wxT("LANGUAGE")){
-		
-			NoteListLanguage->erase(*NoteCount);
-			NoteListLanguage->insert(std::make_pair(*NoteCount, PropertyValue));
-		
-		} else {
+		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);
 		
-			// Something else we don't know about so append
-			// to the tokens variable.
-		
-			if (!PropertyName.IsEmpty() && !PropertyValue.IsEmpty() && PropertyName != wxT("TYPE")){
-		
-				if (FirstToken == TRUE){
-			
-					PropertyTokens.Append(PropertyName + wxT("=") + PropertyValue);
-					FirstToken = FALSE;
-			
-				} else {
-			
-					PropertyTokens.Append(wxT(";") + PropertyName + wxT("=") + PropertyValue);
-			
-				}
+		if (PropertyMatched == TRUE){
 		
-			}
+			PropertyMatched = FALSE;
+			continue;
 		
 		}
+
+		ProcessTokens(&PropertyName, &PropertyValue, &PropertyTokens, &FirstToken);
 	
 	}
 	
@@ -3824,6 +3468,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){
@@ -3857,46 +3502,19 @@ 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));
-		
-		} else if (PropertyName == wxT("PID")){
-
-			CategoriesListPID.erase(*CategoryCount);
-			CategoriesListPID.insert(std::make_pair(*CategoryCount, PropertyValue));
-		
-		} else if (PropertyName == wxT("PREF")){
-
-			ProcessIntegerValue(&CategoriesListPref, &PropertyValue, CategoryCount);
-			
-		} else if (PropertyName == wxT("LANGUAGE")){
-		
-			CategoriesListLanguage.erase(*CategoryCount);
-			CategoriesListLanguage.insert(std::make_pair(*CategoryCount, PropertyValue));
-		
-		} else {
-		
-			// Something else we don't know about so append
-			// to the tokens variable.
-		
-			if (!PropertyName.IsEmpty() && !PropertyValue.IsEmpty() && PropertyName != wxT("TYPE")){
-		
-				if (FirstToken == TRUE){
-			
-					PropertyTokens.Append(PropertyName + wxT("=") + PropertyValue);
-					FirstToken = FALSE;
-			
-				} else {
-			
-					PropertyTokens.Append(wxT(";") + PropertyName + wxT("=") + PropertyValue);
-			
-				}
+		if (PropertyMatched == TRUE){
 		
-			}
+			PropertyMatched = FALSE;
+			continue;
 		
 		}
+
+		ProcessTokens(&PropertyName, &PropertyValue, &PropertyTokens, &FirstToken);
 	
 	}
 	
@@ -4097,6 +3715,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){
@@ -4130,47 +3749,20 @@ void ContactDataObject::ProcessPhoto(wxString PropertySeg1, wxString PropertySeg
 		
 		CaptureString(&PropertyValue, FALSE);
 		
-		if (PropertyName == wxT("ALTID")){
-
-			PicturesListAltID.erase(*PhotoCount);
-			PicturesListAltID.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("PID")){
-
-			PicturesListPID.erase(*PhotoCount);
-			PicturesListPID.insert(std::make_pair(*PhotoCount, PropertyValue));
-		
-		} else if (PropertyName == wxT("PREF")){
-
-			ProcessIntegerValue(&PicturesListPref, &PropertyValue, PhotoCount);
-		
-		} else if (PropertyName == wxT("MEDIATYPE")){
-		
-			PicturesListMediatype.erase(*PhotoCount);
-			PicturesListMediatype.insert(std::make_pair(*PhotoCount, PropertyValue));
-					
-		} else {
+		if (PropertyMatched == TRUE){
 		
-			// Something else we don't know about so append
-			// to the tokens variable.
-			
-			if (!PropertyName.IsEmpty() && !PropertyValue.IsEmpty() && PropertyName != wxT("TYPE")){
-			
-				if (FirstToken == TRUE){
-				
-					PropertyTokens.Append(PropertyName + wxT("=") + PropertyValue);
-					FirstToken = FALSE;
-				
-				} else {
-				
-					PropertyTokens.Append(wxT(";") + PropertyName + wxT("=") + PropertyValue);
-				
-				}
-			
-			}
+			PropertyMatched = FALSE;
+			continue;
 		
 		}
-	
+
+		ProcessTokens(&PropertyName, &PropertyValue, &PropertyTokens, &FirstToken);
+			
 	}	
 	
 	intPropertyLen = PropertySeg2.Len();
@@ -4298,6 +3890,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){
@@ -4331,46 +3924,19 @@ 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));
-		
-		} else if (PropertyName == wxT("PREF")){
-
-			ProcessIntegerValue(&LogosListPref, &PropertyValue, LogoCount);
+		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("MEDIATYPE")){
-		
-			LogosListMediatype.erase(*LogoCount);
-			LogosListMediatype.insert(std::make_pair(*LogoCount, PropertyValue));
-					
-		} else {
+		if (PropertyMatched == TRUE){
 		
-			// Something else we don't know about so append
-			// to the tokens variable.
-			
-			if (!PropertyName.IsEmpty() && !PropertyValue.IsEmpty() && PropertyName != wxT("TYPE")){
-			
-				if (FirstToken == TRUE){
-				
-					PropertyTokens.Append(PropertyName + wxT("=") + PropertyValue);
-					FirstToken = FALSE;
-				
-				} else {
-				
-					PropertyTokens.Append(wxT(";") + PropertyName + wxT("=") + PropertyValue);
-				
-				}
-			
-			}
+			PropertyMatched = FALSE;
+			continue;
 		
 		}
+
+		ProcessTokens(&PropertyName, &PropertyValue, &PropertyTokens, &FirstToken);
 	
 	}	
 	
@@ -4499,6 +4065,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){
@@ -4532,51 +4099,20 @@ 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));
+		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("PREF")){
-
-			ProcessIntegerValue(&SoundsListPref, &PropertyValue, SoundCount);
-		
-		} else if (PropertyName == wxT("MEDIATYPE")){
-		
-			SoundsListMediatype.erase(*SoundCount);
-			SoundsListMediatype.insert(std::make_pair(*SoundCount, PropertyValue));
-
-		} else if (PropertyName == wxT("LANGUAGE")){
-		
-			SoundsListLanguage.erase(*SoundCount);
-			SoundsListLanguage.insert(std::make_pair(*SoundCount, PropertyValue));
-
-		} else {
+		if (PropertyMatched == TRUE){
 		
-			// Something else we don't know about so append
-			// to the tokens variable.
-			
-			if (!PropertyName.IsEmpty() && !PropertyValue.IsEmpty() && PropertyName != wxT("TYPE")){
-			
-				if (FirstToken == TRUE){
-				
-					PropertyTokens.Append(PropertyName + wxT("=") + PropertyValue);
-					FirstToken = FALSE;
-				
-				} else {
-				
-					PropertyTokens.Append(wxT(";") + PropertyName + wxT("=") + PropertyValue);
-				
-				}
-			
-			}
+			PropertyMatched = FALSE;
+			continue;
 		
 		}
+
+		ProcessTokens(&PropertyName, &PropertyValue, &PropertyTokens, &FirstToken);
 	
 	}	
 	
@@ -4705,6 +4241,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){
@@ -4738,46 +4275,19 @@ 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(&CalendarListPref, &PropertyValue, CalURICount);
-		
-		} else if (PropertyName == wxT("MEDIATYPE")){
-		
-			CalendarListMediatype.erase(*CalURICount);
-			CalendarListMediatype.insert(std::make_pair(*CalURICount, PropertyValue));
-
-		} else {
+		if (PropertyMatched == TRUE){
 		
-			// Something else we don't know about so append
-			// to the tokens variable.
-			
-			if (!PropertyName.IsEmpty() && !PropertyValue.IsEmpty() && PropertyName != wxT("TYPE")){
-			
-				if (FirstToken == TRUE){
-				
-					PropertyTokens.Append(PropertyName + wxT("=") + PropertyValue);
-					FirstToken = FALSE;
-				
-				} else {
-				
-					PropertyTokens.Append(wxT(";") + PropertyName + wxT("=") + PropertyValue);
-				
-				}
-			
-			}
+			PropertyMatched = FALSE;
+			continue;
 		
 		}
+
+		ProcessTokens(&PropertyName, &PropertyValue, &PropertyTokens, &FirstToken);
 	
 	}	
 	
@@ -4841,6 +4351,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){
@@ -4874,46 +4385,19 @@ 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));
-		
-		} else if (PropertyName == wxT("PREF")){
-
-			ProcessIntegerValue(&CalendarRequestListPref, &PropertyValue, CalAdrURICount);
+		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("MEDIATYPE")){
-		
-			CalendarRequestListMediatype.erase(*CalAdrURICount);
-			CalendarRequestListMediatype.insert(std::make_pair(*CalAdrURICount, PropertyValue));
-
-		} else {
+		if (PropertyMatched == TRUE){
 		
-			// Something else we don't know about so append
-			// to the tokens variable.
-			
-			if (!PropertyName.IsEmpty() && !PropertyValue.IsEmpty() && PropertyName != wxT("TYPE")){
-			
-				if (FirstToken == TRUE){
-				
-					PropertyTokens.Append(PropertyName + wxT("=") + PropertyValue);
-					FirstToken = FALSE;
-				
-				} else {
-				
-					PropertyTokens.Append(wxT(";") + PropertyName + wxT("=") + PropertyValue);
-				
-				}
-			
-			}
+			PropertyMatched = FALSE;
+			continue;
 		
 		}
+
+		ProcessTokens(&PropertyName, &PropertyValue, &PropertyTokens, &FirstToken);
 	
 	}	
 	
@@ -4977,6 +4461,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){
@@ -5010,46 +4495,19 @@ void ContactDataObject::ProcessCalendarFreeBusy(wxString PropertySeg1, wxString
 		
 		CaptureString(&PropertyValue, FALSE);
 		
-		if (PropertyName == wxT("ALTID")){
-
-			FreeBusyListAltID.erase(*FreeBusyAddressCount);
-			FreeBusyListAltID.insert(std::make_pair(*FreeBusyAddressCount, PropertyValue));
-		
-		} else if (PropertyName == wxT("PID")){
-
-			FreeBusyListPID.erase(*FreeBusyAddressCount);
-			FreeBusyListPID.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("PREF")){
-
-			ProcessIntegerValue(&FreeBusyListPref, &PropertyValue, FreeBusyAddressCount);
-		
-		} else if (PropertyName == wxT("MEDIATYPE")){
-		
-			FreeBusyListMediatype.erase(*FreeBusyAddressCount);
-			FreeBusyListMediatype.insert(std::make_pair(*FreeBusyAddressCount, PropertyValue));
-
-		} else {
+		if (PropertyMatched == TRUE){
 		
-			// Something else we don't know about so append
-			// to the tokens variable.
-			
-			if (!PropertyName.IsEmpty() && !PropertyValue.IsEmpty() && PropertyName != wxT("TYPE")){
-			
-				if (FirstToken == TRUE){
-				
-					PropertyTokens.Append(PropertyName + wxT("=") + PropertyValue);
-					FirstToken = FALSE;
-				
-				} else {
-				
-					PropertyTokens.Append(wxT(";") + PropertyName + wxT("=") + PropertyValue);
-				
-				}
-			
-			}
+			PropertyMatched = FALSE;
+			continue;
 		
 		}
+
+		ProcessTokens(&PropertyName, &PropertyValue, &PropertyTokens, &FirstToken);
 	
 	}	
 	
@@ -5114,6 +4572,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){
@@ -5143,43 +4602,20 @@ 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));
-		
-		} else if (PropertyName == wxT("PID")){
-
-			KeyListPID.erase(*KeyCount);
-			KeyListPID.insert(std::make_pair(*KeyCount, PropertyValue));
+		}
 		
-		} else if (PropertyName == wxT("PREF")){
-
-			ProcessIntegerValue(&KeyListPref, &PropertyValue, KeyCount);
+		ProcessStringValue(&PropertyName, "ALTID", &KeyListAltID, &PropertyValue, KeyCount, &PropertyMatched);
+		ProcessStringValue(&PropertyName, "PID", &KeyListPID, &PropertyValue, KeyCount, &PropertyMatched);
+		ProcessIntegerValue(&PropertyName, "PREF", &KeyListPref, &PropertyValue, KeyCount, &PropertyMatched);
 		
-		} else {
+		if (PropertyMatched == TRUE){
 		
-			// Something else we don't know about so append
-			// to the tokens variable.
-			
-			if (!PropertyName.IsEmpty() && !PropertyValue.IsEmpty() && PropertyName != wxT("TYPE")){
-			
-				if (FirstToken == TRUE){
-				
-					PropertyTokens.Append(PropertyName + wxT("=") + PropertyValue);
-					FirstToken = FALSE;
-				
-				} else {
-				
-					PropertyTokens.Append(wxT(";") + PropertyName + wxT("=") + PropertyValue);
-				
-				}
-			
-			}
+			PropertyMatched = FALSE;
+			continue;
 		
 		}
+
+		ProcessTokens(&PropertyName, &PropertyValue, &PropertyTokens, &FirstToken);
 	
 	}				
 	
@@ -5331,6 +4767,38 @@ void ContactDataObject::ProcessVendor(wxString PropertySeg1, wxString PropertySe
 
 }
 
+void ProcessNameValue(wxString *PropertyData, 
+	wxString *PropertyName, 
+	wxString *PropertyValue){
+
+	wxStringTokenizer PropertyElement (*PropertyData, wxT("="));
+	*PropertyName = PropertyElement.GetNextToken();				
+	*PropertyValue = PropertyElement.GetNextToken();
+
+}
+
+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,
@@ -5379,30 +4847,6 @@ void ProcessIntegerValue(wxString *PropertyName,
 
 }
 
-void ProcessIntegerValue(std::map<int,int> *PrefPtr, 
-	wxString *PropertyValue, 
-	int *ItemCount){
-
-	int PriorityNumber = 0;	
-	bool ValidNumber = TRUE;
-			
-	try{
-		PriorityNumber = std::stoi(PropertyValue->ToStdString());
-	}
-			
-	catch(std::invalid_argument &e){
-		ValidNumber = FALSE;
-	}
-
-	if (ValidNumber == TRUE){
-
-		PrefPtr->erase(*ItemCount);
-		PrefPtr->insert(std::make_pair(*ItemCount, PriorityNumber));
-
-	}
-
-}
-
 void SplitValues(wxString *PropertyLine, 
 	std::map<int,int> *SplitPoints, 
 	std::map<int,int> *SplitLength,