#include "../vcard/vcard.h"
#include "../common/textprocessing.h"
#include "../common/dirs.h"
+#include "cdo/ContactDataObject.h"
bool frmContactEditor::LoadContact(wxString Filename){
}
+ ContactEditorData.LoadFile(Filename);
+
ContactFile.ReadAll(&wxSContactString, wxConvAuto());
// Split the lines.
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;
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 address (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);
+
for (std::map<int,wxString>::iterator iter = ContactFileLines.begin();
iter != ContactFileLines.end(); ++iter){
// Check if version is 4.0, otherwise don't
// load.
- wxPuts(wxSPropertySeg2);
if (wxSPropertySeg2 != wxT("4.0")){
wxMessageBox(_("This file is not a vCard 4.0 contact and is not supported under Xestia Address Book."),
_("Contact not supported"), wxICON_ERROR);
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
LoadAnniversary(wxSPropertySeg1, wxSPropertySeg2, &AnniversaryProcessed);
- } else if (wxSProperty == wxT("TZ")){
+ }*/ else if (wxSProperty == wxT("TZ")){
// See frmContactEditor-LoadTimeZone.cpp
LoadTimeZone(wxSPropertySeg1, wxSPropertySeg2, &TZCount);
- } else if (wxSProperty == wxT("ADR")){
+ }/* else if (wxSProperty == wxT("ADR")){
// See frmContactEditor-LoadAddress.cpp
LoadADR(wxSPropertySeg1, wxSPropertySeg2, &ADRCount);
- } else if (wxSProperty == wxT("EMAIL")){
+ }*/ else if (wxSProperty == wxT("EMAIL")){
// See frmContactEditor-LoadEmail.cpp
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.