Improved checking of FN for meeting the base specification of vCard 4.0.

[xestiaab/.git] / source / contacteditor / ContactDataObject.cpp

diff --git a/source/contacteditor/ContactDataObject.cpp b/source/contacteditor/ContactDataObject.cpp
index 8fb6a39..28c29e7 100644 (file)
--- a/source/contacteditor/ContactDataObject.cpp
+++ b/source/contacteditor/ContactDataObject.cpp
@@ -77,6 +77,7 @@ ContactLoadStatus ContactDataObject::LoadFile(wxString Filename){
        int ContactLineLen = 0;
        int QuoteBreakPoint = 0;
        int GroupCount = 0;
+       int FNCount = 0;
        wxString ContactLine;
        wxString PropertyLine;
        wxString PropertySeg1;
@@ -188,6 +189,11 @@ ContactLoadStatus ContactDataObject::LoadFile(wxString Filename){
                        ProcessMember(PropertySeg1, PropertySeg2, &GroupCount);
                        GroupCount++;   
                
+               } else if (Property == wxT("FN")){
+               
+                       ProcessFN(PropertySeg1, PropertySeg2, &FNCount);
+                       FNCount++;
+               
                }
                
        }
@@ -290,6 +296,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 +318,20 @@ 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){
+
+       FullNamesList.insert(std::make_pair(*FNCount, PropertySeg2));
 
 }