From: Steve Brokenshire <sbrokenshire@xestia.co.uk>
Date: Mon, 28 Dec 2015 04:57:08 +0000 (+0000)
Subject: Replaced string processing in CATEGORIES with ProcessStringValue.
X-Git-Tag: release-0.09~164
X-Git-Url: http://Server1/repobrowser/?a=commitdiff_plain;h=6797b8df7a8d1c265cc789bc3d8c107addd6d599;p=xestiaab%2F.git

Replaced string processing in CATEGORIES with ProcessStringValue.
---

diff --git a/source/contacteditor/ContactDataObject.cpp b/source/contacteditor/ContactDataObject.cpp
index b164760..7f81b11 100644
--- a/source/contacteditor/ContactDataObject.cpp
+++ b/source/contacteditor/ContactDataObject.cpp
@@ -3755,6 +3755,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){
@@ -3788,45 +3789,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(&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);
 		
 			}
-		
+	
 		}
 	
 	}