X-Git-Url: http://Server1/repobrowser/?p=xestiaab%2F.git;a=blobdiff_plain;f=source%2Fcontacteditor%2FContactDataObject.cpp;h=7ff2d76e101df628777cf73d3f56da1261300566;hp=55d2a14dbb8c17f3840e72c4741d8646e87b0bc5;hb=b9604e8cd8e95be8393089d1ec0b81fc8f2b15b1;hpb=1c717d77d60dabd298622aec1f022094bce77c23

diff --git a/source/contacteditor/ContactDataObject.cpp b/source/contacteditor/ContactDataObject.cpp
index 55d2a14..7ff2d76 100644
--- a/source/contacteditor/ContactDataObject.cpp
+++ b/source/contacteditor/ContactDataObject.cpp
@@ -79,6 +79,7 @@ ContactLoadStatus ContactDataObject::LoadFile(wxString Filename){
 	int QuoteBreakPoint = 0;
 	int GroupCount = 0;
 	int FNCount = 0;
+	int NicknameCount = 0;
 	wxString ContactLine;
 	wxString PropertyLine;
 	wxString PropertySeg1;
@@ -196,6 +197,11 @@ ContactLoadStatus ContactDataObject::LoadFile(wxString Filename){
 			ProcessN(PropertySeg1, PropertySeg2);
 			NameProcessed = TRUE;
 		
+		} else if (Property == wxT("NICKNAME")){
+						
+			ProcessNickname(PropertySeg1, PropertySeg2, &NicknameCount);
+			NicknameCount++;
+			
 		}
 		
 	}
@@ -447,8 +453,6 @@ void ContactDataObject::ProcessN(wxString PropertySeg1, wxString PropertySeg2){
 	
 	intPrevValue = 2;
 	
-	NameForename = PropertySeg2;
-	
 	wxString PropertyName;
 	wxString PropertyValue;
 	wxString PropertyData;
@@ -589,7 +593,158 @@ void ContactDataObject::ProcessN(wxString PropertySeg1, wxString PropertySeg2){
 	
 	}
 
-} 
+}
+
+void ContactDataObject::ProcessNickname(wxString PropertySeg1, wxString PropertySeg2, int *NicknameCount){
+
+	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 SplitValues(wxString *PropertyLine, 
 	std::map<int,int> *SplitPoints, 
@@ -640,4 +795,52 @@ void SplitValues(wxString *PropertyLine,
 
 	}
 
+}
+
+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