X-Git-Url: http://Server1/repobrowser/?a=blobdiff_plain;f=source%2Fcontacteditor%2FContactDataObject.h;h=02b682052afc3a0b694125e03754a30428ba2432;hb=5d618c0c96ee88769cc63b0a6fe03679cf68bd18;hp=dda72386ad5828bbbda779842ffd34edbad4d1a4;hpb=cbb594a87fa3bf6d8511d637f8a390f0e9edc9ea;p=xestiaab%2F.git

diff --git a/source/contacteditor/ContactDataObject.h b/source/contacteditor/ContactDataObject.h
index dda7238..02b6820 100644
--- a/source/contacteditor/ContactDataObject.h
+++ b/source/contacteditor/ContactDataObject.h
@@ -22,19 +22,60 @@
 #include <wx/wx.h>
 #include <wx/file.h>
 #include <map>
+#include <wx/tokenzr.h>
+
 #include "../vcard/vcard.h"
+#include "../common/textprocessing.h"
 
 enum ContactLoadStatus{
 	CONTACTLOAD_UNITTESTFAIL = -1,
+	CONTACTLOAD_OK,
 	CONTACTLOAD_FILEMISSING,
 	CONTACTLOAD_FILEERROR,
-	CONTACTLOAD_FILEINVALIDFORMAT
+	CONTACTLOAD_FILEINVALIDFORMAT,
+	CONTACTLOAD_FILEBASESPECFAIL
+};
+
+enum ContactKindType{
+	CONTACTKIND_NONE,
+	CONTACTKIND_INDIVIDUAL,
+	CONTACTKIND_GROUP,
+	CONTACTKIND_ORGANISATION,
+	CONTACTKIND_LOCATION
+};
+
+enum PropertyType{
+	PROPERTY_NONE,
+	PROPERTY_HOME,
+	PROPERTY_WORK
 };
 
 class ContactDataObject{
 
+	private:
+	
+	void ProcessKind(wxString KindData);
+	void ProcessMember(wxString PropertySeg1, wxString PropertySeg2, int *GroupCount);
+	void ProcessFN(wxString PropertySeg1, wxString PropertySeg2, int *FNCount);
+	void ProcessN(wxString PropertySeg1, wxString PropertySeg2);
+	void ProcessNickname(wxString PropertySeg1, wxString PropertySeg2, int *NicknameCount);
+	void ProcessGender(wxString PropertySeg1, wxString PropertySeg2);
+	void ProcessBirthday(wxString PropertySeg1, wxString PropertySeg2);
+	void ProcessAnniversary(wxString PropertySeg1, wxString PropertySeg2);
+	void ProcessTimeZone(wxString PropertySeg1, wxString PropertySeg2, int *TimeZoneCount);
+	void ProcessAddress(wxString PropertySeg1, wxString PropertySeg2, int *AddressCount);
+	void ProcessEmail(wxString PropertySeg1, wxString PropertySeg2, int *EmailCount);
+	void ProcessIM(wxString PropertySeg1, wxString PropertySeg2, int *IMCount);
+	void ProcessTelephone(wxString PropertySeg1, wxString PropertySeg2, int *TelephoneCount);
+	void ProcessLanguage(wxString PropertySeg1, wxString PropertySeg2, int *LanguageCount);
+	void ProcessGeographic(wxString PropertySeg1, wxString PropertySeg2, int *GeographicCount);
+	void ProcessRelated(wxString PropertySeg1, wxString PropertySeg2, int *RelatedCount);
+	void ProcessURL(wxString PropertySeg1, wxString PropertySeg2, int *URLCount);
+
 	public:
 
+	ContactKindType ContactKind = CONTACTKIND_NONE;
+
 	/* Items on General Tab */
 
 	wxString NameTitle;
@@ -121,6 +162,7 @@ class ContactDataObject{
 	std::map<int, wxString> GeneralTelephoneListPID;
 	std::map<int, wxString> GeneralTelephoneListType;
 	std::map<int, wxString> GeneralTelephoneListTokens;
+	std::map<int, wxString> GeneralTelephoneListTypeInfo;
 	std::map<int, int> GeneralTelephoneListPref;
 	
 	std::map<int, wxString> GeneralLanguageList;
@@ -242,6 +284,7 @@ class ContactDataObject{
 	std::map<int, wxString> HomeTelephoneListPID;
 	std::map<int, wxString> HomeTelephoneListType;
 	std::map<int, wxString> HomeTelephoneListTokens;
+	std::map<int, wxString> HomeTelephoneListTypeInfo;
 	std::map<int, int> HomeTelephoneListPref;
 	
 	std::map<int, wxString> HomeLanguageList;
@@ -267,15 +310,6 @@ class ContactDataObject{
 	std::map<int, wxString> HomeGeographyListMediatype;
 	std::map<int, int> HomeGeographyListPref;
 	
-	std::map<int, wxString> HomeRelatedList;
-	std::map<int, wxString> HomeRelatedListRelType;
-	std::map<int, wxString> HomeRelatedListLanguage;
-	std::map<int, wxString> HomeRelatedListAltID;
-	std::map<int, wxString> HomeRelatedListPID;
-	std::map<int, wxString> HomeRelatedListType;
-	std::map<int, wxString> HomeRelatedListTokens;
-	std::map<int, int> HomeRelatedListPref;		
-	
 	std::map<int, wxString> HomeWebsiteList;
 	std::map<int, wxString> HomeWebsiteListAltID;
 	std::map<int, wxString> HomeWebsiteListPID;
@@ -362,6 +396,7 @@ class ContactDataObject{
 	std::map<int, wxString> BusinessTelephoneListAltID;
 	std::map<int, wxString> BusinessTelephoneListPID;
 	std::map<int, wxString> BusinessTelephoneListType;
+	std::map<int, wxString> BusinessTelephoneListTypeInfo;
 	std::map<int, wxString> BusinessTelephoneListTokens;
 	std::map<int, int> BusinessTelephoneListPref;
 	
@@ -386,16 +421,7 @@ class ContactDataObject{
 	std::map<int, wxString> BusinessGeographyListType;
 	std::map<int, wxString> BusinessGeographyListTokens;
 	std::map<int, wxString> BusinessGeographyListMediatype;
-	std::map<int, int> BusinessGeographyListPref;
-	
-	std::map<int, wxString> BusinessRelatedList;
-	std::map<int, wxString> BusinessRelatedListRelType;
-	std::map<int, wxString> BusinessRelatedListLanguage;
-	std::map<int, wxString> BusinessRelatedListAltID;
-	std::map<int, wxString> BusinessRelatedListPID;
-	std::map<int, wxString> BusinessRelatedListType;
-	std::map<int, wxString> BusinessRelatedListTokens;
-	std::map<int, int> BusinessRelatedListPref;			
+	std::map<int, int> BusinessGeographyListPref;			
 	
 	std::map<int, wxString> BusinessWebsiteList;
 	std::map<int, wxString> BusinessWebsiteListAltID;
@@ -453,6 +479,7 @@ class ContactDataObject{
 	std::map<int, wxString> GroupsListAltID;
 	std::map<int, wxString> GroupsListPID;
 	std::map<int, wxString> GroupsListType;
+	std::map<int, wxString> GroupsListMediaType;
 	std::map<int, wxString> GroupsListTokens;
 	std::map<int, int> GroupsListPref;
 	
@@ -545,4 +572,15 @@ class ContactDataObject{
 
 };
 
+void SplitValues(wxString *PropertyLine, 
+	std::map<int,int> *SplitPoints, 
+	std::map<int,int> *SplitLength, 
+	int intSize);
+	
+void CheckType(wxString *PropertySeg1, 
+	std::map<int,int> *SplitPoints, 
+	std::map<int,int> *SplitLength, 
+	int *intPrevValue, 
+	PropertyType *intType);
+
 #endif
\ No newline at end of file