X-Git-Url: http://Server1/repobrowser/?a=blobdiff_plain;f=source%2Fcontacteditor%2FfrmContactEditor-Load.cpp;h=aa5b0e9d845df99ea4c13a6cf4896ef566726efb;hb=01a3141be71e31f6eabd97d65cb630ddeaa1a5c9;hp=6b97937ccf37a851c99cbed02f4af6e2407853ea;hpb=d06d0b1d631e7a48c34738397e98651f541d4000;p=xestiaab%2F.git

diff --git a/source/contacteditor/frmContactEditor-Load.cpp b/source/contacteditor/frmContactEditor-Load.cpp
index 6b97937..aa5b0e9 100644
--- a/source/contacteditor/frmContactEditor-Load.cpp
+++ b/source/contacteditor/frmContactEditor-Load.cpp
@@ -30,6 +30,7 @@
 #include "../vcard/vcard.h"
 #include "../common/textprocessing.h"
 #include "../common/dirs.h"
+#include "cdo/ContactDataObject.h"
 
 bool frmContactEditor::LoadContact(wxString Filename){
 
@@ -61,6 +62,8 @@ bool frmContactEditor::LoadContact(wxString Filename){
 	
 	}
 	
+	ContactEditorData.LoadFile(Filename);
+	
 	ContactFile.ReadAll(&wxSContactString, wxConvAuto());
 	
 	// Split the lines.
@@ -87,13 +90,13 @@ bool frmContactEditor::LoadContact(wxString Filename){
 	bool HasExtraNicknames = FALSE;
 	bool IgnoreGender = FALSE;
 	bool ExtraLineSeek = TRUE;
-	bool BirthdayProcessed = FALSE;
-	bool AnniversaryProcessed = FALSE;
+	//bool BirthdayProcessed = FALSE;
+	//bool AnniversaryProcessed = FALSE;
 	bool FNProcessed = FALSE;
 	bool GenderProcessed = FALSE;
 	bool NameProcessed = FALSE;
-	bool UIDProcessed = FALSE;
-	bool KindProcessed = FALSE;
+	//bool UIDProcessed = FALSE;
+	//bool KindProcessed = FALSE;
 	bool ETagFound = FALSE;
 	bool ETagOrigFound = FALSE;
 	bool VersionProcessed = FALSE;
@@ -133,6 +136,75 @@ bool frmContactEditor::LoadContact(wxString Filename){
 	int XTokenCount = 0;
 	//int intValueSeek = 1;
 
+	// Process the unique ID (UID)
+	
+	UIDToken = ContactEditorData.UIDToken;
+
+	// Process the contact type (KIND) (frmContactEditor-LoadGroup.cpp)
+
+	LoadKind(&ContactEditorData.ContactKind);
+
+	// Process the Birthday (BDAY) (frmContactEditor-LoadBADays.cpp)
+	
+	LoadBirthday(&ContactEditorData.Birthday, &ContactEditorData.BirthdayText);
+
+	// Process the Anniversary (ANNIVERSARY) (frmContactEditor-LoadBADays.cpp)
+	
+	LoadAnniversary(&ContactEditorData.Anniversary, &ContactEditorData.AnniversaryText);
+
+	// Process the Gender (GENDER) (frmContactEditor-LoadGender.cpp)
+	
+	LoadGender(&ContactEditorData.Gender, &ContactEditorData.GenderDetails);
+	
+	// Process the Name (N) (frmContactEditor-LoadName.cpp)
+	
+	LoadName(&ContactEditorData.NameTitle, &ContactEditorData.NameForename,
+		&ContactEditorData.NameSurname, &ContactEditorData.NameOtherNames,
+		&ContactEditorData.NameSuffix);
+		
+	// Process the group members (MEMBER) (frmContactEditor-LoadGroup.cpp)
+		
+	LoadMember(&ContactEditorData.GroupsList);
+
+	// Process the addresses (ADR) (frmContactEditor-LoadAddress.cpp)
+	
+	LoadAddress(&ContactEditorData.GeneralAddressList,
+		&ContactEditorData.GeneralAddressListTown,
+		&ContactEditorData.GeneralAddressListCounty,
+		&ContactEditorData.GeneralAddressListPostCode,
+		&ContactEditorData.GeneralAddressListPref,
+		&ContactEditorData.HomeAddressList,
+		&ContactEditorData.HomeAddressListTown,
+		&ContactEditorData.HomeAddressListCounty,
+		&ContactEditorData.HomeAddressListPostCode,
+		&ContactEditorData.HomeAddressListPref,
+		&ContactEditorData.BusinessAddressList,
+		&ContactEditorData.BusinessAddressListTown,
+		&ContactEditorData.BusinessAddressListCounty,
+		&ContactEditorData.BusinessAddressListPostCode,
+		&ContactEditorData.BusinessAddressListPref,
+		&ADRCount);
+
+	// Process the timezones (TZ) (frmContactEditor-LoadTimeZone.cpp)
+	
+	LoadTimeZone(&ContactEditorData.GeneralTZList,
+		&ContactEditorData.GeneralTZListPref,
+		&ContactEditorData.HomeTZList,
+		&ContactEditorData.HomeTZListPref,
+		&ContactEditorData.BusinessTZList,
+		&ContactEditorData.BusinessTZListPref,
+		&TZCount);
+		
+	// Process the emails (frmContactEditor-LoadEmail.cpp)
+	
+	LoadEmail(&ContactEditorData.GeneralEmailList,
+		&ContactEditorData.GeneralEmailListPref,
+		&ContactEditorData.HomeEmailList,
+		&ContactEditorData.HomeEmailListPref,
+		&ContactEditorData.BusinessEmailList,
+		&ContactEditorData.BusinessEmailListPref,
+		&EmailCount);	
+
 	for (std::map<int,wxString>::iterator iter = ContactFileLines.begin(); 
 	 iter != ContactFileLines.end(); ++iter){
 	
@@ -234,37 +306,37 @@ bool frmContactEditor::LoadContact(wxString Filename){
 			
 			VersionProcessed = TRUE;
 		
-		} if (wxSProperty == wxT("KIND") && KindProcessed == FALSE){
+		}/* if (wxSProperty == wxT("KIND") && KindProcessed == FALSE){
 		
 			// See frmContactEditor-LoadGroup.cpp
 		
 			LoadKind(wxSPropertySeg2);
 		
-		} else if (wxSProperty == wxT("MEMBER")){
+		}/* else if (wxSProperty == wxT("MEMBER")){
 
 			// See frmContactEditor-LoadGroup.cpp
 
 			LoadMember(wxSPropertySeg2, &GroupCount);		
 		
-		} else if (wxSProperty == wxT("FN")){
+		}*/ else if (wxSProperty == wxT("FN")){
 		
 			// See frmContactEditor-LoadName.cpp
 		
 			LoadFN(wxSPropertySeg1, wxSPropertySeg2, &FNCount, &FNProcessed, &ContactData);
 		
-		} else if (wxSProperty == wxT("N") && NameProcessed == FALSE){
+		}/* else if (wxSProperty == wxT("N") && NameProcessed == FALSE){
 		
 			// See frmContactEditor-LoadName.cpp
 		
 			LoadN(wxSPropertySeg1, wxSPropertySeg2, &NameProcessed, &ContactData);
 		
-		} else if (wxSProperty == wxT("NICKNAME")){
+		}*/ else if (wxSProperty == wxT("NICKNAME")){
 			
 			// See frmContactEditor-LoadNickname.cpp
 			
 			LoadNickname(wxSPropertySeg1, wxSPropertySeg2, &NicknameCount, &ContactData);
 			
-		} else if (wxSProperty == wxT("GENDER") && GenderProcessed == FALSE){
+		}/* else if (wxSProperty == wxT("GENDER") && GenderProcessed == FALSE){
 		
 			// See frmContactEditor-LoadGender.cpp
 		
@@ -288,7 +360,7 @@ bool frmContactEditor::LoadContact(wxString Filename){
 		
 			LoadTimeZone(wxSPropertySeg1, wxSPropertySeg2, &TZCount);	
 		
-		} else if (wxSProperty == wxT("ADR")){
+		}  else if (wxSProperty == wxT("ADR")){
 			
 			// See frmContactEditor-LoadAddress.cpp
 		
@@ -300,7 +372,7 @@ bool frmContactEditor::LoadContact(wxString Filename){
 			
 			LoadEmail(wxSPropertySeg1, wxSPropertySeg2, &EmailCount);	
 		
-		} else if (wxSProperty == wxT("IMPP")){
+		}*/ else if (wxSProperty == wxT("IMPP")){
 		
 			// See frmContactEditor-LoadIM.cpp
 		
@@ -408,12 +480,12 @@ bool frmContactEditor::LoadContact(wxString Filename){
 			
 			LoadKey(wxSPropertySeg1, wxSPropertySeg2, &KeyCount);
 		
-		} else if (wxSProperty == wxT("UID") && UIDProcessed == FALSE){
+		}/* else if (wxSProperty == wxT("UID") && UIDProcessed == FALSE){
 		
 			UIDToken = wxSPropertySeg2;
 			UIDProcessed = TRUE;
 		
-		} else if (wxSProperty.Mid(0, 3) == wxT("VND")){
+		}*/ else if (wxSProperty.Mid(0, 3) == wxT("VND")){
 		
 			// Split the Vendor three ways.