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

diff --git a/source/contacteditor/ContactDataObject.cpp b/source/contacteditor/ContactDataObject.cpp
index 9ced5ea..2a7f6a4 100644
--- a/source/contacteditor/ContactDataObject.cpp
+++ b/source/contacteditor/ContactDataObject.cpp
@@ -74,9 +74,16 @@ ContactLoadStatus ContactDataObject::LoadFile(wxString Filename){
 	bool QuoteMode = FALSE;
 	bool PropertyFind = TRUE;
 	bool KindProcessed = FALSE;
+	bool NameProcessed = FALSE;
+	bool GenderProcessed = FALSE;
+	bool BirthdayProcessed = FALSE;
+	bool AnniversaryProcessed = FALSE;
 	int ContactLineLen = 0;
 	int QuoteBreakPoint = 0;
 	int GroupCount = 0;
+	int FNCount = 0;
+	int NicknameCount = 0;
+	int TimeZoneCount = 0;
 	wxString ContactLine;
 	wxString PropertyLine;
 	wxString PropertySeg1;
@@ -176,18 +183,49 @@ ContactLoadStatus ContactDataObject::LoadFile(wxString Filename){
 		PropertySeg2 = ContactLine.Mid((QuoteBreakPoint + 1));
 		
 		 if (Property == wxT("KIND") && KindProcessed == FALSE){
-		
-			// See frmContactEditor-LoadGroup.cpp
-		
+				
 			ProcessKind(PropertySeg2);
 		
 		} else if (Property == wxT("MEMBER")){
 
-			// See frmContactEditor-LoadGroup.cpp
-
 			ProcessMember(PropertySeg1, PropertySeg2, &GroupCount);
 			GroupCount++;	
 		
+		} else if (Property == wxT("FN")){
+		
+			ProcessFN(PropertySeg1, PropertySeg2, &FNCount);
+			FNCount++;
+		
+		} else if (Property == wxT("N") && NameProcessed == FALSE){
+		
+			ProcessN(PropertySeg1, PropertySeg2);
+			NameProcessed = TRUE;
+		
+		} else if (Property == wxT("NICKNAME")){
+						
+			ProcessNickname(PropertySeg1, PropertySeg2, &NicknameCount);
+			NicknameCount++;
+			
+		} else if (Property == wxT("GENDER") && GenderProcessed == FALSE){
+		
+			ProcessGender(PropertySeg1, PropertySeg2);
+			GenderProcessed = TRUE;
+		
+		} else if (Property == wxT("BDAY") && BirthdayProcessed == FALSE){
+		
+			ProcessBirthday(PropertySeg1, PropertySeg2);
+			BirthdayProcessed = TRUE;
+		
+		} else if (Property == wxT("ANNIVERSARY") && AnniversaryProcessed == FALSE){
+		
+			ProcessAnniversary(PropertySeg1, PropertySeg2);
+			AnniversaryProcessed = TRUE;
+		
+		} else if (Property == wxT("TZ")){
+		
+			ProcessTimeZone(PropertySeg1, PropertySeg2, &TimeZoneCount);
+			TimeZoneCount++;
+		
 		}
 		
 	}
@@ -234,8 +272,6 @@ void ContactDataObject::ProcessMember(wxString PropertySeg1, wxString PropertySe
 
 	intPrevValue = 7;
 	
-	// Look for type before continuing.
-	
 	wxString PropertyName;
 	wxString PropertyValue;
 	wxString PropertyData;
@@ -257,8 +293,6 @@ void ContactDataObject::ProcessMember(wxString PropertySeg1, wxString PropertySe
 		intPrevValue = intiter->second;
 		
 		CaptureString(&PropertyValue, FALSE);
-		
-		//ContactProcess::ContactProcessCaptureStrings(&PropertyValue);
 	
 		if (PropertyName == wxT("ALTID")){
 
@@ -312,8 +346,6 @@ void ContactDataObject::ProcessMember(wxString PropertySeg1, wxString PropertySe
 		
 	}
 
-	//SplitValues(&PropertySeg1, &SplitPoints, &SplitLength, intPrevValue);
-
 	GroupsList.insert(std::make_pair(*GroupCount, PropertySeg2));
 
 	if (!PropertyTokens.IsEmpty()){
@@ -325,53 +357,1006 @@ void ContactDataObject::ProcessMember(wxString PropertySeg1, wxString PropertySe
 
 }
 
-void SplitValues(wxString *PropertyLine, 
-	std::map<int,int> *SplitPoints, 
-	std::map<int,int> *SplitLength, 
-	int intSize){
+void ContactDataObject::ProcessFN(wxString PropertySeg1, wxString PropertySeg2, int *FNCount){
+
+	std::map<int, int> SplitPoints;
+	std::map<int, int> SplitLength;
+
+	int intPrevValue = 4;
+	int intPref = 0;			
+	int intType = 0;
 	
-	size_t intPropertyLen = PropertyLine->Len();
+	SplitValues(&PropertySeg1, &SplitPoints, &SplitLength, intPrevValue);
+
+	intPrevValue = 3;
+	
+	wxString PropertyName;
+	wxString PropertyValue;
+	wxString PropertyData;
+	wxString PropertyTokens;
+	std::map<int,int>::iterator SLiter;
+	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("TYPE")){
+
+			if (!PropertyValue.IsEmpty() || PropertyValue == wxT("home") ||
+				PropertyValue == wxT("work") ){
+
+				FullNamesListType.erase(*FNCount);
+				FullNamesListType.insert(std::make_pair(*FNCount, PropertyValue));
+		
+			}
+		
+		} else if (PropertyName == wxT("LANGUAGE")){
+
+			FullNamesListLanguage.erase(*FNCount);
+			FullNamesListLanguage.insert(std::make_pair(*FNCount, PropertyValue));
+		
+		} else if (PropertyName == wxT("ALTID")){
+		
+			FullNamesListAltID.erase(*FNCount);
+			FullNamesListAltID.insert(std::make_pair(*FNCount, PropertyValue));
+		
+		} else if (PropertyName == wxT("PID")){
+
+			FullNamesListPID.erase(*FNCount);
+			FullNamesListPID.insert(std::make_pair(*FNCount, 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){
+
+				FullNamesListPref.erase(*FNCount);
+				FullNamesListPref.insert(std::make_pair(*FNCount, PriorityNumber));
+
+			}
+		
+		} else if (!PropertyName.IsEmpty() && !PropertyValue.IsEmpty()){
+			
+			if (FirstToken == TRUE){
+				
+				PropertyTokens.Append(PropertyName + wxT("=") + PropertyValue);
+				FirstToken = FALSE;
+				
+			} else {
+			
+				PropertyTokens.Append(wxT(";") + PropertyName + wxT("=") + PropertyValue);
+				
+			}
+			
+		} 
+	
+	}
+
+	FullNamesList.insert(std::make_pair(*FNCount, PropertySeg2));
+
+	if (!PropertyTokens.IsEmpty()){
+	
+		FullNamesListTokens.insert(std::make_pair(*FNCount, PropertyTokens));
+	
+	}
+
+}
+
+void ContactDataObject::ProcessN(wxString PropertySeg1, wxString PropertySeg2){
+
+	std::map<int, int> SplitPoints;
+	std::map<int, int> SplitLength;
+
+	int intPrevValue = 3;
+	int intPref = 0;			
+	int intType = 0;
+	
+	SplitValues(&PropertySeg1, &SplitPoints, &SplitLength, intPrevValue);
+	
+	intPrevValue = 2;
+	
+	wxString PropertyName;
+	wxString PropertyValue;
+	wxString PropertyData;
+	wxString PropertyTokens;
+	std::map<int,int>::iterator SLiter;
+	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")){
+
+			NameAltID = PropertyValue;
+		
+		} else if (PropertyName == wxT("LANGUAGE")){
+		
+			NameLanguage = PropertyValue;
+		
+		} else if (PropertyName == wxT("SORT-AS")){
+		
+			if (PropertyValue.Left(1) == wxT("\"") && PropertyValue.Right(1) == wxT("\"") &&
+				PropertyValue.Len() >= 3){
+				NameDisplayAs = PropertyValue.Mid(1, (PropertyValue.Len() - 2));
+			}
+		
+		} else if (!PropertyName.IsEmpty() && !PropertyValue.IsEmpty()){
+			
+			if (FirstToken == TRUE){
+				
+				PropertyTokens.Append(PropertyName + wxT("=") + PropertyValue);
+				FirstToken = FALSE;
+				
+			} else {
+			
+				PropertyTokens.Append(wxT(";") + PropertyName + wxT("=") + PropertyValue);
+				
+			}
+			
+		}
+	
+	}
+	
+	// Split the name data.
+	
+	int intSplitSeek = 0;		
 	int intSplitsFound = 0;
 	int intSplitSize = 0;
-	int intSplitSeek = 0;
+	int intPropertyLen = PropertySeg2.Len();
 	
-	for (int i = intSize; i <= intPropertyLen; i++){
-
-		intSplitSize++;
+	std::map<int,wxString> NameValues;
+	intPrevValue = 0;					
+	
+	for (int i = 0; i <= intPropertyLen; i++){
+	
+		if (PropertySeg2.Mid(i, 1) == wxT(";") && PropertySeg2.Mid((i - 1), 1) != wxT("\\")){
+			
+			NameValues.insert(std::make_pair(++intSplitsFound, PropertySeg2.Mid(intSplitSeek, intSplitSize)));
+			
+			intSplitSeek = i;
+			intSplitSeek++;
+			
+			if (intSplitsFound == 4){
+			
+				NameValues.insert(std::make_pair(++intSplitsFound, PropertySeg2.Mid(intSplitSeek, wxString::npos)));
+				break;
+			
+			}
+			
+			intSplitSize = 0;
+			continue;
 	
-		if (PropertyLine->Mid(i, 1) == wxT(";") &&
-		    PropertyLine->Mid((i - 1), 1) != wxT("\\")){
-	   
-		    if (intSplitsFound == 0){
-	    
-			SplitLength->insert(std::make_pair(intSplitsFound, (intSplitSize)));
-	  
-		    } else {
-	   
-			SplitLength->insert(std::make_pair(intSplitsFound, (intSplitSize - 1)));
-	    
-		    }
-	    
-		    SplitPoints->insert(std::make_pair(intSplitsFound, (i + 1)));
-	    
-		    intSplitsFound++;
-		    intSplitSeek = i;
-		    intSplitSize = 0;
-	    
 		}
+		
+		intSplitSize++;
 
 	}
+	
+	// Split the data into several parts.
+			
+	for (std::map<int, wxString>::iterator iter = NameValues.begin(); 
+	iter != NameValues.end(); ++iter){
+	
+		if (iter->first == 1){
+		
+			// Deal with family name.
+			
+			NameSurname = iter->second;
+		
+		} else if (iter->first == 2){
+		
+			// Deal with given names.
+			
+			NameForename = iter->second;
+		
+		} else if (iter->first == 3){
+		
+			// Deal with additional names.
+			
+			NameOtherNames = iter->second;
+		
+		} else if (iter->first == 4){
+		
+			// Deal with honorifix prefixes and suffixes.
 
-	if (intSplitsFound == 0){
+			NameTitle = iter->second;
+		
+			iter++;
+			
+			if (iter == NameValues.end()){
+			
+				break;
+			
+			}
+		
+			NameSuffix = iter->second;
+		
+		}
+	
+	}
+	
+	// Add the name token data.
+	
+	if (!PropertyTokens.IsEmpty()){
+	
+		NameTokens = PropertyTokens;
+	
+	}
 
-		SplitPoints->insert(std::make_pair(intSplitsFound, (8 + 1)));
-		SplitLength->insert(std::make_pair(intSplitsFound, intSplitSize));
+}
 
-	} else {
+void ContactDataObject::ProcessNickname(wxString PropertySeg1, wxString PropertySeg2, int *NicknameCount){
 
-		SplitPoints->insert(std::make_pair(intSplitsFound, (intSplitSeek + 1)));
-		SplitLength->insert(std::make_pair(intSplitsFound, intSplitSize));
+	std::map<int, int> SplitPoints;
+	std::map<int, int> SplitLength;
 
+	int intPrevValue = 10;
+	int intPref = 0;			
+	
+	SplitValues(&PropertySeg1, &SplitPoints, &SplitLength, intPrevValue);
+	
+	intPrevValue = 9;
+	
+	PropertyType PropType;
+	
+	// Look for type before continuing.
+	
+	CheckType(&PropertySeg1, &SplitPoints, &SplitLength, &intPrevValue, &PropType);
+	
+	intPrevValue = 9;
+	
+	std::map<int, wxString> *NicknamesList = NULL;
+	std::map<int, wxString> *NicknamesListType = NULL;
+	std::map<int, wxString> *NicknamesListLanguage = NULL;
+	std::map<int, wxString> *NicknamesListAltID = NULL;
+	std::map<int, wxString> *NicknamesListPID = NULL;
+	std::map<int, wxString> *NicknamesListTokens = NULL;		
+	std::map<int, int> *NicknamesListPref = NULL;
+	
+	switch(PropType){
+		case PROPERTY_NONE:
+			NicknamesList = &GeneralNicknamesList;
+			NicknamesListType = &GeneralNicknamesListType;
+			NicknamesListLanguage = &GeneralNicknamesListLanguage;
+			NicknamesListAltID = &GeneralNicknamesListAltID;
+			NicknamesListPID = &GeneralNicknamesListPID;
+			NicknamesListTokens = &GeneralNicknamesListTokens;
+			NicknamesListPref = &GeneralNicknamesListPref;
+			break;
+		case PROPERTY_HOME:
+			NicknamesList = &HomeNicknamesList;
+			NicknamesListType = &HomeNicknamesListType;
+			NicknamesListLanguage = &HomeNicknamesListLanguage;
+			NicknamesListAltID = &HomeNicknamesListAltID;
+			NicknamesListPID = &HomeNicknamesListPID;
+			NicknamesListTokens = &HomeNicknamesListTokens;
+			NicknamesListPref = &HomeNicknamesListPref;
+			break;
+		case PROPERTY_WORK:
+			NicknamesList = &BusinessNicknamesList;
+			NicknamesListType = &BusinessNicknamesListType;
+			NicknamesListLanguage = &BusinessNicknamesListLanguage;
+			NicknamesListAltID = &BusinessNicknamesListAltID;
+			NicknamesListPID = &BusinessNicknamesListPID;
+			NicknamesListTokens = &BusinessNicknamesListTokens;
+			NicknamesListPref = &BusinessNicknamesListPref;
+			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")){
+
+			NicknamesListAltID->erase(*NicknameCount);
+			NicknamesListAltID->insert(std::make_pair(*NicknameCount, PropertyValue));
+		
+		} else if (PropertyName == wxT("PID")){
+
+			NicknamesListPID->erase(*NicknameCount);
+			NicknamesListPID->insert(std::make_pair(*NicknameCount, 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){
+
+				NicknamesListPref->erase(*NicknameCount);
+				NicknamesListPref->insert(std::make_pair(*NicknameCount, PriorityNumber));
+
+			}
+		
+		} else if (PropertyName == wxT("LANGUAGE")){
+
+			NicknamesListLanguage->erase(*NicknameCount);
+			NicknamesListLanguage->insert(std::make_pair(*NicknameCount, 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);
+			
+				}
+		
+			}
+		
+		}
+		
+	}
+	
+	NicknamesList->insert(std::make_pair(*NicknameCount, PropertySeg2));
+	
+	// Add the name token data.
+	
+	if (!PropertyTokens.IsEmpty()){
+	
+		NicknamesListTokens->insert(std::make_pair(*NicknameCount, PropertyTokens));
+	
+	}
+
+}
+
+void ContactDataObject::ProcessGender(wxString PropertySeg1, wxString PropertySeg2){
+
+	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 intPrevValue = 8;
+
+	SplitValues(&PropertySeg1, &SplitPoints, &SplitLength, intPrevValue);
+
+	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);
+			
+		}				
+		
+		if (!PropertyName.IsEmpty() && !PropertyValue.IsEmpty()){
+
+			if (FirstToken == TRUE){
+	
+				PropertyTokens.Append(PropertyName + wxT("=") + PropertyValue);
+				FirstToken = FALSE;
+	
+			} else {
+	
+				PropertyTokens.Append(wxT(";") + PropertyName + wxT("=") + PropertyValue);
+	
+			}
+
+		}
+	
+	}	
+
+	wxStringTokenizer GenderData (PropertySeg2, wxT(";"));
+	
+	wxString GenderComponent;
+	
+	if (GenderData.CountTokens() >= 2){
+	
+		Gender = GenderData.GetNextToken();
+		GenderDetails = GenderData.GetString();
+	
+		CaptureString(&GenderDetails, FALSE);
+						
+	} else {
+	
+		Gender = GenderData.GetNextToken();
+	
+	}
+	
+	if (!PropertyTokens.IsEmpty()){
+	
+		GenderTokens = PropertyTokens;
+	
+	}
+
+}
+
+void ContactDataObject::ProcessBirthday(wxString PropertySeg1, wxString PropertySeg2){
+
+	// Process date. Preserve the remainder in the string.
+
+	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 BirthdayText = FALSE;
+	int intPrevValue = 6;
+
+	SplitValues(&PropertySeg1, &SplitPoints, &SplitLength, intPrevValue);
+
+	intPrevValue = 5;
+
+	// Look for type before continuing.
+
+	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;
+	
+		if (PropertyName == wxT("VALUE") && PropertyValue == wxT("text") && BirthdayText == FALSE){
+	
+			CaptureString(&PropertySeg2, FALSE);
+			Birthday = PropertySeg2;
+			BirthdayText = TRUE;
+	
+		}
+
+	}
+
+	// Setup blank lines for later on.
+	
+	intPrevValue = 5;
+	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;
+	
+		// Process properties.
+	
+		CaptureString(&PropertyValue, FALSE);
+	
+		if (PropertyValue.Mid((PropertyValue.Len() - 1), 1) == wxT("\"")){
+		
+			PropertyValue.Trim();
+			PropertyValue.RemoveLast();
+		
+		}				
+	
+		if (PropertyValue.Mid(0, 1) == wxT("\"")){
+		
+			PropertyValue.Remove(0, 1);
+		
+		}				
+	
+		if (PropertyName == wxT("ALTID")){
+
+			BirthdayAltID = PropertyValue;
+	
+		} else if (PropertyName == wxT("CALSCALE")){
+	
+			BirthdayCalScale = PropertyValue;
+	
+		} else if (PropertyName != wxT("VALUE")) {
+	
+			// Something else we don't know about so append
+			// to the tokens variable.
+		
+			if (!PropertyName.IsEmpty() && !PropertyValue.IsEmpty()){
+		
+				if (FirstToken == TRUE){
+	
+					PropertyTokens.Append(PropertyName + wxT("=") + PropertyValue);
+					FirstToken = FALSE;
+	
+				} else {
+	
+					PropertyTokens.Append(wxT(";") + PropertyName + wxT("=") + PropertyValue);
+	
+				}
+				
+			}
+			
+		}
+
+	}	
+
+	// Add the data to the variables and form.
+	
+	if (BirthdayText == FALSE){
+	
+		Birthday = PropertySeg2;
+
+	}
+	
+	if (!PropertyTokens.IsEmpty()){
+	
+		BirthdayTokens = PropertyTokens;
+
+	}
+
+}
+
+void ContactDataObject::ProcessAnniversary(wxString PropertySeg1, wxString PropertySeg2){
+
+	// Process date. Preserve the remainder in the string.
+
+	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 AnniversaryText = FALSE;
+	int intPrevValue = 13;
+
+	SplitValues(&PropertySeg1, &SplitPoints, &SplitLength, intPrevValue);
+
+	intPrevValue = 12;
+
+	// Look for type before continuing.
+
+	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;
+	
+		if (PropertyName == wxT("VALUE") && PropertyValue == wxT("text") && AnniversaryText == FALSE){
+	
+			CaptureString(&PropertySeg2, FALSE);
+			Anniversary = PropertySeg2;
+			AnniversaryText = TRUE;
+	
+		}
+
+	}
+
+	// Setup blank lines for later on.
+	
+	intPrevValue = 12;
+	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;
+	
+		// Process properties.
+	
+		CaptureString(&PropertyValue, FALSE);
+	
+		if (PropertyValue.Mid((PropertyValue.Len() - 1), 1) == wxT("\"")){
+		
+			PropertyValue.Trim();
+			PropertyValue.RemoveLast();
+		
+		}				
+	
+		if (PropertyValue.Mid(0, 1) == wxT("\"")){
+		
+			PropertyValue.Remove(0, 1);
+		
+		}				
+	
+		if (PropertyName == wxT("ALTID")){
+
+			AnniversaryAltID = PropertyValue;
+	
+		} else if (PropertyName == wxT("CALSCALE")){
+	
+			AnniversaryCalScale = PropertyValue;
+	
+		} else if (PropertyName != wxT("VALUE")) {
+	
+			// Something else we don't know about so append
+			// to the tokens variable.
+		
+			if (!PropertyName.IsEmpty() && !PropertyValue.IsEmpty()){
+		
+				if (FirstToken == TRUE){
+	
+					PropertyTokens.Append(PropertyName + wxT("=") + PropertyValue);
+					FirstToken = FALSE;
+	
+				} else {
+	
+					PropertyTokens.Append(wxT(";") + PropertyName + wxT("=") + PropertyValue);
+	
+				}
+				
+			}
+			
+		}
+
+	}	
+
+	// Add the data to the variables and form.
+	
+	if (AnniversaryText == FALSE){
+	
+		Anniversary = PropertySeg2;
+
+	}
+	
+	if (!PropertyTokens.IsEmpty()){
+	
+		AnniversaryTokens = PropertyTokens;
+
+	}
+
+}
+
+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, 
+	int intSize){
+	
+	size_t intPropertyLen = PropertyLine->Len();
+	int intSplitsFound = 0;
+	int intSplitSize = 0;
+	int intSplitSeek = 0;
+	
+	for (int i = intSize; i <= intPropertyLen; i++){
+
+		intSplitSize++;
+	
+		if (PropertyLine->Mid(i, 1) == wxT(";") &&
+		    PropertyLine->Mid((i - 1), 1) != wxT("\\")){
+	   
+		    if (intSplitsFound == 0){
+	    
+			SplitLength->insert(std::make_pair(intSplitsFound, (intSplitSize)));
+	  
+		    } else {
+	   
+			SplitLength->insert(std::make_pair(intSplitsFound, (intSplitSize - 1)));
+	    
+		    }
+	    
+		    SplitPoints->insert(std::make_pair(intSplitsFound, (i + 1)));
+	    
+		    intSplitsFound++;
+		    intSplitSeek = i;
+		    intSplitSize = 0;
+	    
+		}
+
+	}
+
+	if (intSplitsFound == 0){
+
+		SplitPoints->insert(std::make_pair(intSplitsFound, (8 + 1)));
+		SplitLength->insert(std::make_pair(intSplitsFound, intSplitSize));
+
+	} else {
+
+		SplitPoints->insert(std::make_pair(intSplitsFound, (intSplitSeek + 1)));
+		SplitLength->insert(std::make_pair(intSplitsFound, intSplitSize));
+
+	}
+
+}
+
+void CheckType(wxString *PropertySeg1, 
+	std::map<int,int> *SplitPoints, 
+	std::map<int,int> *SplitLength, 
+	int *intPrevValue, 
+	PropertyType *PropType){
+	
+	wxString PropertyData;
+	wxString PropertyName;
+	wxString PropertyValue;
+	std::map<int,int>::iterator SLiter;
+	
+	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;
+		
+		if (PropertyName == wxT("TYPE")){
+				
+			if (PropertyValue == wxT("work")){
+			
+				*PropType = PROPERTY_WORK;
+							
+			} else if (PropertyValue == wxT("home")){
+
+				*PropType = PROPERTY_HOME;
+							
+			} else {
+			
+				*PropType = PROPERTY_NONE;
+			
+			}
+		
+			return;
+		
+		}
+	
+	}
+	
 }
\ No newline at end of file