Added SORT-AS and extra tokens code and unit tests for the N vCard parameter in Conta...

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

diff --git a/source/contacteditor/ContactDataObject.cpp b/source/contacteditor/ContactDataObject.cpp
index 54e0bfd..5f9ca27 100644 (file)
--- a/source/contacteditor/ContactDataObject.cpp
+++ b/source/contacteditor/ContactDataObject.cpp
@@ -479,9 +479,39 @@ void ContactDataObject::ProcessN(wxString PropertySeg1, wxString PropertySeg2){
                
                        NameLanguage = PropertyValue;
                
+               } else if (PropertyName == wxT("SORT-AS")){
+               
+                       if (PropertyValue.Left(1) == wxT("\"") && PropertyValue.Right(1) == wxT("\"") &&
+                               PropertyValue.Len() >= 3){
+                               NameDisplayAs = PropertyValue.Mid(1, (PropertyValue.Len() - 2));
+                       }
+               
+               } else if (!PropertyName.IsEmpty() && !PropertyValue.IsEmpty()){
+                       
+                       if (FirstToken == TRUE){
+                               
+                               PropertyTokens.Append(PropertyName + wxT("=") + PropertyValue);
+                               FirstToken = FALSE;
+                               
+                       } else {
+                       
+                               PropertyTokens.Append(wxT(";") + PropertyName + wxT("=") + PropertyValue);
+                               
+                       }
+                       
                }
        
        }
+       
+       // Split the name data.
+       
+       // Add the name token data.
+       
+       if (!PropertyTokens.IsEmpty()){
+       
+               NameTokens = PropertyTokens;
+       
+       }
 
 }