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

diff --git a/source/contacteditor/ContactDataObject.cpp b/source/contacteditor/ContactDataObject.cpp
index 56b2846..b543ebb 100644
--- a/source/contacteditor/ContactDataObject.cpp
+++ b/source/contacteditor/ContactDataObject.cpp
@@ -1067,39 +1067,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);
 				
+			}
+		
 		}
 	
 	}	
@@ -1180,6 +1163,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){
@@ -1196,45 +1180,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(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);
+		
+			}
+	
 		}
 		
 	}
@@ -1655,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){
@@ -1671,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);
 		
 			}
-		
+	
 		}
 		
 	}
@@ -1761,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);
 	
@@ -1863,62 +1821,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")){
-		
-			AddressListGeo->erase(*AddressCount);
-			AddressListGeo->insert(std::make_pair(*AddressCount, PropertyValue));
+		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);
 		
-		} 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);
 			
 			}
-		
+			
 		}
 	
 	}