X-Git-Url: http://Server1/repobrowser/?a=blobdiff_plain;f=source%2Fcontacteditor%2Fcdo%2FContactDataObject-Save.cpp;h=9e3db13f9523c27c6978153995b10c1d11bea76f;hb=316e255b6797f8b7a63ccd62e50e39cfcc474c11;hp=d14240b57707303d8d8d1a210d74b58eb3df6cfd;hpb=622c4c58d84d8d0718aa5b32ff44d33f669c2c69;p=xestiaab%2F.git

diff --git a/source/contacteditor/cdo/ContactDataObject-Save.cpp b/source/contacteditor/cdo/ContactDataObject-Save.cpp
index d14240b..9e3db13 100644
--- a/source/contacteditor/cdo/ContactDataObject-Save.cpp
+++ b/source/contacteditor/cdo/ContactDataObject-Save.cpp
@@ -19,6 +19,35 @@
 #include "ContactDataObject.h"
 #include "../../version.h"
 
+ContactSaveStatus ContactDataObject::SaveFile(wxString SaveFilename){
+	
+	// Get the data using SaveString.
+	
+	wxString SaveData = "";
+	SaveString(&SaveData);
+	
+	// Open a file and try to write into it.
+	
+	wxFile ContactFile;
+	
+	if (!ContactFile.Open(SaveFilename, wxFile::write, wxS_DEFAULT)){
+	
+		return CONTACTSAVE_FILEERROR;
+	
+	}
+	
+	if (ContactFile.Write(SaveData, wxConvUTF8) == false){
+		
+		return CONTACTSAVE_WRITEERROR;
+		
+	}
+	
+	ContactFile.Close();
+	
+	return CONTACTSAVE_OK;
+	
+}
+
 ContactSaveStatus ContactDataObject::SaveString(wxString *SaveData){
 	
 	ContactSaveStatus SaveDataStatus = CONTACTSAVE_UNITTESTFAIL;
@@ -268,6 +297,70 @@ ContactSaveStatus ContactDataObject::SaveString(wxString *SaveData){
 			
 	}
 	
+	// Process N.
+	
+	if (!NameTitle.IsEmpty() || !NameForename.IsEmpty() || !NameSurname.IsEmpty() ||
+		!NameOtherNames.IsEmpty() || !NameSuffix.IsEmpty()){
+		
+		ProcessData.Append("N");
+		
+		// Check if there is a value for ALTID.
+		
+		if (NameAltID.size() > 0){
+		
+			ProcessData.Append(";ALTID=");
+			ProcessData.Append(NameAltID);
+			
+		}
+
+		// Check if there is a value for LANGUAGE.
+		
+		if (NameLanguage.size() > 0){
+		
+			ProcessData.Append(";LANGUAGE=");
+			ProcessData.Append(NameLanguage);
+			
+		}
+		
+		// Check if there is a value for SORT-AS.
+		
+		if (NameDisplayAs.size() > 0){
+		
+			ProcessData.Append(";SORT-AS=\"");
+			ProcessData.Append(NameDisplayAs);
+			ProcessData.Append("\"");
+			
+		}
+
+		// Check if there is a value for tokens.
+
+		if (NameTokens.size() > 0){
+		
+			ProcessData.Append(";");
+			ProcessData.Append(NameTokens);
+			
+		}
+			
+		ProcessData.Append(":");
+		ProcessData.Append(NameSurname);
+		ProcessData.Append(";");
+		ProcessData.Append(NameForename);
+		ProcessData.Append(";");
+		ProcessData.Append(NameOtherNames);
+		ProcessData.Append(";");
+		ProcessData.Append(NameTitle);
+		ProcessData.Append(";");
+		ProcessData.Append(NameSuffix);
+		
+		ProcessData.Append("\n");
+
+		ProcessData = OutputText(&ProcessData);
+		
+		SaveData->Append(ProcessData);
+		ProcessData.clear();
+			
+	}
+	
 	// Process NICKNAME.
 	
 	SaveNickname(&GeneralNicknamesList, &GeneralNicknamesListAltID, 
@@ -283,6 +376,126 @@ ContactSaveStatus ContactDataObject::SaveString(wxString *SaveData){
 		&BusinessNicknamesListLanguage, &BusinessNicknamesListPref, 
 		&BusinessNicknamesListTokens, SaveData, "work");
 	
+	// Process GENDER.
+	
+	if (Gender.size() > 0){
+		
+		ProcessData.Append("GENDER");
+		
+		if (GenderTokens.size() > 0){
+			
+			ProcessData.Append(";");
+			ProcessData.Append(GenderTokens);
+			
+		}
+		
+		ProcessData.Append(":");
+		ProcessData.Append(Gender);
+		
+		if (GenderDetails.size() > 0){
+			
+			ProcessData.Append(";");
+			ProcessData.Append(GenderDetails);
+			
+		}
+		
+		ProcessData.Append("\n");
+
+		ProcessData = OutputText(&ProcessData);
+		
+		SaveData->Append(ProcessData);
+		ProcessData.clear();
+		
+	}
+	
+	// Process BDAY.
+	
+	if (Birthday.size() > 0){
+		
+		ProcessData.Append("BDAY");
+
+		// Check if there is a value for ALTID.
+		
+		if (BirthdayAltID.size() > 0){
+			
+			ProcessData.Append(";ALTID=");
+			ProcessData.Append(BirthdayAltID);
+			
+		}
+
+		// Check if there is a value for CALSCALE.
+		
+		if (BirthdayAltID.size() > 0){
+			
+			ProcessData.Append(";CALSCALE=");
+			ProcessData.Append(BirthdayCalScale);
+			
+		}
+		
+		// Check if there is a value for tokens.
+		
+		if (BirthdayTokens.size() > 0){
+		
+			ProcessData.Append(";");
+			ProcessData.Append(BirthdayTokens);
+			
+		}
+		
+		ProcessData.Append(":");
+		ProcessData.Append(Birthday);
+		ProcessData.Append("\n");
+		
+		ProcessData = OutputText(&ProcessData);
+		
+		SaveData->Append(ProcessData);
+		ProcessData.clear();
+		
+	}
+	
+	// Process ANNIVERSARY.
+	
+	if (Anniversary.size() > 0){
+		
+		ProcessData.Append("ANNIVERSARY");
+
+		// Check if there is a value for ALTID.
+		
+		if (AnniversaryAltID.size() > 0){
+			
+			ProcessData.Append(";ALTID=");
+			ProcessData.Append(AnniversaryAltID);
+			
+		}
+
+		// Check if there is a value for CALSCALE.
+		
+		if (AnniversaryAltID.size() > 0){
+			
+			ProcessData.Append(";CALSCALE=");
+			ProcessData.Append(AnniversaryCalScale);
+			
+		}
+		
+		// Check if there is a value for tokens.
+		
+		if (AnniversaryTokens.size() > 0){
+		
+			ProcessData.Append(";");
+			ProcessData.Append(AnniversaryTokens);
+			
+		}
+		
+		ProcessData.Append(":");
+		ProcessData.Append(Anniversary);
+		ProcessData.Append("\n");
+		
+		ProcessData = OutputText(&ProcessData);
+		
+		SaveData->Append(ProcessData);
+		ProcessData.clear();
+		
+	}
+	
 	// Process TITLE.
 
 	SaveTitle(&GeneralTitleList, &GeneralTitleListLanguage,