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

diff --git a/source/contacteditor/ContactDataObject.cpp b/source/contacteditor/ContactDataObject.cpp
index 8fb6a39..7ff2d76 100644
--- a/source/contacteditor/ContactDataObject.cpp
+++ b/source/contacteditor/ContactDataObject.cpp
@@ -74,9 +74,12 @@ ContactLoadStatus ContactDataObject::LoadFile(wxString Filename){
 	bool QuoteMode = FALSE;
 	bool PropertyFind = TRUE;
 	bool KindProcessed = FALSE;
+	bool NameProcessed = FALSE;
 	int ContactLineLen = 0;
 	int QuoteBreakPoint = 0;
 	int GroupCount = 0;
+	int FNCount = 0;
+	int NicknameCount = 0;
 	wxString ContactLine;
 	wxString PropertyLine;
 	wxString PropertySeg1;
@@ -176,18 +179,29 @@ 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++;
+			
 		}
 		
 	}
@@ -234,8 +248,6 @@ void ContactDataObject::ProcessMember(wxString PropertySeg1, wxString PropertySe
 
 	intPrevValue = 7;
 	
-	// Look for type before continuing.
-	
 	wxString PropertyName;
 	wxString PropertyValue;
 	wxString PropertyData;
@@ -257,8 +269,6 @@ void ContactDataObject::ProcessMember(wxString PropertySeg1, wxString PropertySe
 		intPrevValue = intiter->second;
 		
 		CaptureString(&PropertyValue, FALSE);
-		
-		//ContactProcess::ContactProcessCaptureStrings(&PropertyValue);
 	
 		if (PropertyName == wxT("ALTID")){
 
@@ -290,6 +300,11 @@ void ContactDataObject::ProcessMember(wxString PropertySeg1, wxString PropertySe
 		
 			}
 		
+		} else if (PropertyName == wxT("MEDIATYPE")){
+
+			GroupsListMediaType.erase(*GroupCount);
+			GroupsListMediaType.insert(std::make_pair(*GroupCount, PropertyValue));
+		
 		} else if (!PropertyName.IsEmpty() && !PropertyValue.IsEmpty()){
 			
 			if (FirstToken == TRUE){
@@ -307,10 +322,427 @@ void ContactDataObject::ProcessMember(wxString PropertySeg1, wxString PropertySe
 		
 	}
 
-	//SplitValues(&PropertySeg1, &SplitPoints, &SplitLength, intPrevValue);
-
 	GroupsList.insert(std::make_pair(*GroupCount, PropertySeg2));
 
+	if (!PropertyTokens.IsEmpty()){
+	
+		GroupsListTokens.insert(std::make_pair(*GroupCount, PropertyTokens));
+	
+	}
+
+
+}
+
+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;
+	
+	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 intPropertyLen = PropertySeg2.Len();
+	
+	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;
+	
+		}
+		
+		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.
+
+			NameTitle = iter->second;
+		
+			iter++;
+			
+			if (iter == NameValues.end()){
+			
+				break;
+			
+			}
+		
+			NameSuffix = iter->second;
+		
+		}
+	
+	}
+	
+	// Add the name token data.
+	
+	if (!PropertyTokens.IsEmpty()){
+	
+		NameTokens = PropertyTokens;
+	
+	}
+
+}
+
+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));
+	
+	}
 
 }
 
@@ -363,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