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

diff --git a/source/contacteditor/ContactDataObject.cpp b/source/contacteditor/ContactDataObject.cpp
index 7ff2d76..5275553 100644
--- a/source/contacteditor/ContactDataObject.cpp
+++ b/source/contacteditor/ContactDataObject.cpp
@@ -75,6 +75,9 @@ ContactLoadStatus ContactDataObject::LoadFile(wxString Filename){
 	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;
@@ -202,6 +205,21 @@ ContactLoadStatus ContactDataObject::LoadFile(wxString Filename){
 			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;
+		
 		}
 		
 	}
@@ -746,6 +764,346 @@ void ContactDataObject::ProcessNickname(wxString PropertySeg1, wxString Property
 
 }
 
+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 = 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") && AnniversaryText == FALSE){
+	
+			CaptureString(&PropertySeg2, FALSE);
+			Anniversary = PropertySeg2;
+			AnniversaryText = 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")){
+
+			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 SplitValues(wxString *PropertyLine, 
 	std::map<int,int> *SplitPoints, 
 	std::map<int,int> *SplitLength,