X-Git-Url: http://Server1/repobrowser/?a=blobdiff_plain;f=source%2Fcontacteditor%2FContactDataObject.cpp;h=56b28467ffc0c1ac74981631890a122bb09d3659;hb=e853e78e586e6de204aeb733e05cccd6d568929a;hp=47fe119f7b065927c9f91b2da3c83147ded63a3e;hpb=1759400884dfefa8bba80c2cef27aa8ee2d05c2c;p=xestiaab%2F.git

diff --git a/source/contacteditor/ContactDataObject.cpp b/source/contacteditor/ContactDataObject.cpp
index 47fe119..56b2846 100644
--- a/source/contacteditor/ContactDataObject.cpp
+++ b/source/contacteditor/ContactDataObject.cpp
@@ -731,6 +731,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){
@@ -747,26 +748,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(&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){
 				
@@ -813,6 +807,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){
@@ -838,27 +833,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(&FullNamesListPref, &PropertyValue, FNCount);
+		}
 		
-		} else if (!PropertyName.IsEmpty() && !PropertyValue.IsEmpty()){
+		if (!PropertyName.IsEmpty() && !PropertyValue.IsEmpty()){
 			
 			if (FirstToken == TRUE){