X-Git-Url: http://Server1/repobrowser/?p=xestiaab%2F.git;a=blobdiff_plain;f=source%2Fcontacteditor%2FContactDataObject.cpp;h=2a7f6a4839fd9c296d23381b085d61a751060581;hp=5275553fef33a7fcb1e5cac575efd8891cd4807c;hb=ac5416e95caeeefefdbf9706b65926f6b75589cf;hpb=b9c2b33681e480071aa685c157b456bf5990ef41

diff --git a/source/contacteditor/ContactDataObject.cpp b/source/contacteditor/ContactDataObject.cpp
index 5275553..2a7f6a4 100644
--- a/source/contacteditor/ContactDataObject.cpp
+++ b/source/contacteditor/ContactDataObject.cpp
@@ -83,6 +83,7 @@ ContactLoadStatus ContactDataObject::LoadFile(wxString Filename){
 	int GroupCount = 0;
 	int FNCount = 0;
 	int NicknameCount = 0;
+	int TimeZoneCount = 0;
 	wxString ContactLine;
 	wxString PropertyLine;
 	wxString PropertySeg1;
@@ -220,6 +221,11 @@ ContactLoadStatus ContactDataObject::LoadFile(wxString Filename){
 			ProcessAnniversary(PropertySeg1, PropertySeg2);
 			AnniversaryProcessed = TRUE;
 		
+		} else if (Property == wxT("TZ")){
+		
+			ProcessTimeZone(PropertySeg1, PropertySeg2, &TimeZoneCount);
+			TimeZoneCount++;
+		
 		}
 		
 	}
@@ -990,11 +996,11 @@ void ContactDataObject::ProcessAnniversary(wxString PropertySeg1, wxString Prope
 	wxString PropertyValue;
 	wxString PropertyTokens;
 	bool AnniversaryText = FALSE;
-	int intPrevValue = 6;
+	int intPrevValue = 13;
 
 	SplitValues(&PropertySeg1, &SplitPoints, &SplitLength, intPrevValue);
 
-	intPrevValue = 5;
+	intPrevValue = 12;
 
 	// Look for type before continuing.
 
@@ -1023,7 +1029,7 @@ void ContactDataObject::ProcessAnniversary(wxString PropertySeg1, wxString Prope
 
 	// Setup blank lines for later on.
 	
-	intPrevValue = 5;
+	intPrevValue = 12;
 	bool FirstToken = TRUE;
 
 	for (std::map<int, int>::iterator intiter = SplitPoints.begin(); 
@@ -1104,6 +1110,158 @@ void ContactDataObject::ProcessAnniversary(wxString PropertySeg1, wxString Prope
 
 }
 
+void ContactDataObject::ProcessTimeZone(wxString PropertySeg1, wxString PropertySeg2, int *TimeZoneCount){
+
+	std::map<int, int> SplitPoints;
+	std::map<int, int> SplitLength;
+
+	int intPrevValue = 4;
+	int intPref = 0;			
+	
+	SplitValues(&PropertySeg1, &SplitPoints, &SplitLength, intPrevValue);
+	
+	intPrevValue = 3;
+	
+	PropertyType PropType;
+	
+	// Look for type before continuing.
+	
+	CheckType(&PropertySeg1, &SplitPoints, &SplitLength, &intPrevValue, &PropType);
+	
+	intPrevValue = 3;
+	
+	std::map<int, wxString> *TZList = NULL;
+	std::map<int, wxString> *TZListType = NULL;
+	std::map<int, wxString> *TZListMediatype = NULL;
+	std::map<int, wxString> *TZListAltID = NULL;
+	std::map<int, wxString> *TZListPID = NULL;
+	std::map<int, wxString> *TZListTokens = NULL;		
+	std::map<int, int> *TZListPref = NULL;
+	
+	switch(PropType){
+		case PROPERTY_NONE:
+			TZList = &GeneralTZList;
+			TZListType = &GeneralTZListType;
+			TZListMediatype = &GeneralTZListMediatype;
+			TZListAltID = &GeneralTZListAltID;
+			TZListPID = &GeneralTZListPID;
+			TZListTokens = &GeneralTZListTokens;
+			TZListPref = &GeneralTZListPref;
+			break;
+		case PROPERTY_HOME:
+			TZList = &HomeTZList;
+			TZListType = &HomeTZListType;
+			TZListMediatype = &HomeTZListMediatype;
+			TZListAltID = &HomeTZListAltID;
+			TZListPID = &HomeTZListPID;
+			TZListTokens = &HomeTZListTokens;
+			TZListPref = &HomeTZListPref;
+			break;
+		case PROPERTY_WORK:
+			TZList = &BusinessTZList;
+			TZListType = &BusinessTZListType;
+			TZListMediatype = &BusinessTZListMediatype;
+			TZListAltID = &BusinessTZListAltID;
+			TZListPID = &BusinessTZListPID;
+			TZListTokens = &BusinessTZListTokens;
+			TZListPref = &BusinessTZListPref;
+			break;
+	}
+	
+	std::map<int, int>::iterator SLiter;	
+	wxString PropertyData;
+	wxString PropertyName;
+	wxString PropertyValue;
+	wxString PropertyTokens;
+	bool FirstToken = TRUE;
+	
+	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;
+		
+		CaptureString(&PropertyValue, FALSE);
+
+		if (PropertyName == wxT("ALTID")){
+
+			TZListAltID->erase(*TimeZoneCount);
+			TZListAltID->insert(std::make_pair(*TimeZoneCount, PropertyValue));
+		
+		} else if (PropertyName == wxT("PID")){
+
+			TZListPID->erase(*TimeZoneCount);
+			TZListPID->insert(std::make_pair(*TimeZoneCount, 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){
+
+				TZListPref->erase(*TimeZoneCount);
+				TZListPref->insert(std::make_pair(*TimeZoneCount, PriorityNumber));
+
+			}
+		
+		} else if (PropertyName == wxT("MEDIATYPE")){
+
+			TZListMediatype->erase(*TimeZoneCount);
+			TZListMediatype->insert(std::make_pair(*TimeZoneCount, 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);
+			
+				}
+		
+			}
+		
+		}
+		
+	}
+	
+	TZList->insert(std::make_pair(*TimeZoneCount, PropertySeg2));
+	
+	// Add the name token data.
+	
+	if (!PropertyTokens.IsEmpty()){
+	
+		TZListTokens->insert(std::make_pair(*TimeZoneCount, PropertyTokens));
+	
+	}
+
+
+}
+
 void SplitValues(wxString *PropertyLine, 
 	std::map<int,int> *SplitPoints, 
 	std::map<int,int> *SplitLength,