X-Git-Url: http://Server1/repobrowser/?a=blobdiff_plain;f=source%2Fcontacteditor%2FContactDataObject.cpp;h=44a361d3b1da291de934629cc0273e1d158bcac1;hb=cccf4ec6bbbc80aaf383dbe9b88fc91671bdbaf5;hp=fd9aa4fe175868c0d62b4fb7fcfcccbd037fd45e;hpb=c34383734a0f334101c9cf0b36297696e4be19a5;p=xestiaab%2F.git

diff --git a/source/contacteditor/ContactDataObject.cpp b/source/contacteditor/ContactDataObject.cpp
index fd9aa4f..44a361d 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);
 	
 	}	
 	
@@ -4580,6 +4571,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){
@@ -4613,42 +4605,28 @@ void ContactDataObject::ProcessCalendarURI(wxString PropertySeg1, wxString Prope
 		
 		CaptureString(&PropertyValue, FALSE);
 		
-		if (PropertyName == wxT("ALTID")){
-
-			CalendarListAltID.erase(*CalURICount);
-			CalendarListAltID.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("PID")){
-
-			CalendarListPID.erase(*CalURICount);
-			CalendarListPID.insert(std::make_pair(*CalURICount, PropertyValue));
-		
-		} else if (PropertyName == wxT("PREF")){
-
-			ProcessIntegerValue(&CalendarListPref, &PropertyValue, CalURICount);
+		if (PropertyMatched == TRUE){
 		
-		} else if (PropertyName == wxT("MEDIATYPE")){
+			PropertyMatched = FALSE;
+			continue;
 		
-			CalendarListMediatype.erase(*CalURICount);
-			CalendarListMediatype.insert(std::make_pair(*CalURICount, PropertyValue));
+		}
 
-		} else {
+		if (!PropertyName.IsEmpty() && !PropertyValue.IsEmpty() && PropertyName != wxT("TYPE")){
 		
-			// Something else we don't know about so append
-			// to the tokens variable.
+			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);
 			
 			}
 		
@@ -4716,6 +4694,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){
@@ -4749,42 +4728,28 @@ void ContactDataObject::ProcessCalendarAddressURI(wxString PropertySeg1, wxStrin
 		
 		CaptureString(&PropertyValue, FALSE);
 		
-		if (PropertyName == wxT("ALTID")){
-
-			CalendarRequestListAltID.erase(*CalAdrURICount);
-			CalendarRequestListAltID.insert(std::make_pair(*CalAdrURICount, PropertyValue));
+		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("PID")){
-
-			CalendarRequestListPID.erase(*CalAdrURICount);
-			CalendarRequestListPID.insert(std::make_pair(*CalAdrURICount, PropertyValue));
-		
-		} else if (PropertyName == wxT("PREF")){
-
-			ProcessIntegerValue(&CalendarRequestListPref, &PropertyValue, CalAdrURICount);
+		if (PropertyMatched == TRUE){
 		
-		} else if (PropertyName == wxT("MEDIATYPE")){
+			PropertyMatched = FALSE;
+			continue;
 		
-			CalendarRequestListMediatype.erase(*CalAdrURICount);
-			CalendarRequestListMediatype.insert(std::make_pair(*CalAdrURICount, PropertyValue));
+		}
 
-		} else {
+		if (!PropertyName.IsEmpty() && !PropertyValue.IsEmpty() && PropertyName != wxT("TYPE")){
 		
-			// Something else we don't know about so append
-			// to the tokens variable.
+			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);
 			
 			}
 		
@@ -4852,6 +4817,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){
@@ -4885,42 +4851,28 @@ 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);
+		if (PropertyMatched == TRUE){
 		
-		} else if (PropertyName == wxT("MEDIATYPE")){
+			PropertyMatched = FALSE;
+			continue;
 		
-			FreeBusyListMediatype.erase(*FreeBusyAddressCount);
-			FreeBusyListMediatype.insert(std::make_pair(*FreeBusyAddressCount, PropertyValue));
+		}
 
-		} else {
+		if (!PropertyName.IsEmpty() && !PropertyValue.IsEmpty() && PropertyName != wxT("TYPE")){
 		
-			// Something else we don't know about so append
-			// to the tokens variable.
+			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);
 			
 			}
 		
@@ -4989,6 +4941,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){
@@ -5018,39 +4971,29 @@ 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));
+		ProcessStringValue(&PropertyName, "ALTID", &KeyListAltID, &PropertyValue, KeyCount, &PropertyMatched);
+		ProcessStringValue(&PropertyName, "PID", &KeyListPID, &PropertyValue, KeyCount, &PropertyMatched);
+		ProcessIntegerValue(&PropertyName, "PREF", &KeyListPref, &PropertyValue, KeyCount, &PropertyMatched);
 		
-		} else if (PropertyName == wxT("PID")){
-
-			KeyListPID.erase(*KeyCount);
-			KeyListPID.insert(std::make_pair(*KeyCount, PropertyValue));
+		if (PropertyMatched == TRUE){
 		
-		} else if (PropertyName == wxT("PREF")){
-
-			ProcessIntegerValue(&KeyListPref, &PropertyValue, KeyCount);
+			PropertyMatched = FALSE;
+			continue;
 		
-		} else {
+		}
+
+		if (!PropertyName.IsEmpty() && !PropertyValue.IsEmpty() && PropertyName != wxT("TYPE")){
 		
-			// Something else we don't know about so append
-			// to the tokens variable.
+			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);
 			
 			}
 		
@@ -5206,6 +5149,28 @@ void ContactDataObject::ProcessVendor(wxString PropertySeg1, wxString PropertySe
 
 }
 
+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,
@@ -5254,30 +5219,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,