X-Git-Url: http://Server1/repobrowser/?p=xestiaab%2F.git;a=blobdiff_plain;f=source%2Fcontacteditor%2FContactDataObject.cpp;h=d14043c53e13f4c90089380beae9aaac78e04d88;hp=05241d287ad83a5a12fbd676d313a21acd2c8145;hb=991f1b1f9333b7b4aae5543cc1c10474d33e83be;hpb=d5e5a52dfa7ba94138977833034789f794740134

diff --git a/source/contacteditor/ContactDataObject.cpp b/source/contacteditor/ContactDataObject.cpp
index 05241d2..d14043c 100644
--- a/source/contacteditor/ContactDataObject.cpp
+++ b/source/contacteditor/ContactDataObject.cpp
@@ -100,7 +100,8 @@ ContactLoadStatus ContactDataObject::LoadFile(wxString Filename){
 	int PhotoCount = 0;
 	int LogoCount = 0;
 	int SoundCount = 0;
-	int CalAdrCount = 0;
+	int CalendarCount = 0;
+	int CalendarAddressCount = 0;
 	wxString ContactLine;
 	wxString PropertyLine;
 	wxString PropertySeg1;
@@ -358,8 +359,13 @@ ContactLoadStatus ContactDataObject::LoadFile(wxString Filename){
 
 			// See frmContactEditor-LoadCalendar.cpp
 			
-			ProcessCalendarURI(PropertySeg1, PropertySeg2, &CalAdrCount);
-			CalAdrCount++;
+			ProcessCalendarURI(PropertySeg1, PropertySeg2, &CalendarCount);
+			CalendarCount++;
+		
+		} else if (Property == wxT("CALADRURI")){
+		
+			ProcessCalendarAddressURI(PropertySeg1, PropertySeg2, &CalendarAddressCount);
+			CalendarAddressCount++;
 		
 		}
 		
@@ -4883,6 +4889,158 @@ void ContactDataObject::ProcessCalendarURI(wxString PropertySeg1, wxString Prope
 
 }
 
+void ContactDataObject::ProcessCalendarAddressURI(wxString PropertySeg1, wxString PropertySeg2, int *CalAdrURICount){
+
+	size_t intPropertyLen = PropertySeg1.Len();
+	std::map<int, int> SplitPoints;
+	std::map<int, int> SplitLength;
+	std::map<int, int>::iterator SLiter;			
+	wxString PropertyData;
+	wxString PropertyName;
+	wxString PropertyValue;
+	wxString PropertyTokens;
+	bool FirstToken = TRUE;
+	int intSplitsFound = 0;
+	int intSplitSize = 0;
+	int intPrevValue = 8;
+	int intPref = 0;			
+	int intType = 0;
+	
+	SplitValues(&PropertySeg1, &SplitPoints, &SplitLength, intPrevValue);
+	
+	intPrevValue = 7;
+	
+	PropertyType PropType = PROPERTY_NONE;
+	
+	// Look for type before continuing.			
+
+	CheckType(&PropertySeg1, &SplitPoints, &SplitLength, &intPrevValue, &PropType);
+
+	intPrevValue = 7;
+
+	for (std::map<int, int>::iterator intiter = SplitPoints.begin(); 
+	intiter != SplitPoints.end(); ++intiter){
+	
+		SLiter = SplitLength.find(intiter->first);
+	
+		PropertyData = PropertySeg1.Mid(intPrevValue, (SLiter->second));
+		
+		wxStringTokenizer PropertyElement (PropertyData, wxT("="));
+		PropertyName = PropertyElement.GetNextToken();				
+		PropertyValue = PropertyElement.GetNextToken();
+		
+		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 == 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")){
+			
+			int PriorityNumber = 0;
+			bool ValidNumber = TRUE;
+			
+			try{
+				PriorityNumber = std::stoi(PropertyValue.ToStdString());
+			}
+			
+			catch(std::invalid_argument &e){
+				ValidNumber = FALSE;
+			}
+
+			if (ValidNumber == TRUE){
+
+				CalendarRequestListPref.erase(*CalAdrURICount);
+				CalendarRequestListPref.insert(std::make_pair(*CalAdrURICount, PriorityNumber));
+
+			}
+		
+		} else if (PropertyName == wxT("MEDIATYPE")){
+		
+			CalendarRequestListMediatype.erase(*CalAdrURICount);
+			CalendarRequestListMediatype.insert(std::make_pair(*CalAdrURICount, 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);
+				
+				}
+			
+			}
+		
+		}
+	
+	}	
+	
+	intPropertyLen = PropertySeg2.Len();
+	SplitPoints.clear();
+	SplitLength.clear();
+	intSplitsFound = 0;
+	intSplitSize = 0;
+	intPrevValue = 0;
+	
+	CaptureString(&PropertySeg2, FALSE);
+	
+	// Add the data to the General/Home/Work address variables.
+		
+	switch(PropType){
+		case PROPERTY_NONE:
+			break;
+		case PROPERTY_HOME:
+			CalendarRequestListType.insert(std::make_pair(*CalAdrURICount, "home"));
+			break;
+		case PROPERTY_WORK:
+			CalendarRequestListType.insert(std::make_pair(*CalAdrURICount, "work"));
+			break;
+	}
+	
+	CalendarRequestList.insert(std::make_pair(*CalAdrURICount, PropertySeg2));
+	
+	if (!PropertyTokens.IsEmpty()){
+	
+		CalendarRequestListTokens.insert(std::make_pair(*CalAdrURICount, PropertyTokens));
+	
+	}	
+	
+}
+
 void SplitValues(wxString *PropertyLine, 
 	std::map<int,int> *SplitPoints, 
 	std::map<int,int> *SplitLength,