Home | News | Projects | Releases
Bugs | RFE | Repositories | Help
Replaced string processing in ROLE with ProcessStringValue.
[xestiaab/.git] / source / contacteditor / ContactDataObject.cpp
index a8c6e7d..245341b 100644 (file)
@@ -78,8 +78,11 @@ ContactLoadStatus ContactDataObject::LoadFile(wxString Filename){
        bool GenderProcessed = FALSE;
        bool BirthdayProcessed = FALSE;
        bool AnniversaryProcessed = FALSE;
+       bool UIDProcessed = FALSE;
+       bool RevisionProcessed = FALSE;
        int ContactLineLen = 0;
        int QuoteBreakPoint = 0;
+       int SourceCount = 0;
        int GroupCount = 0;
        int FNCount = 0;
        int NicknameCount = 0;
@@ -93,6 +96,21 @@ ContactLoadStatus ContactDataObject::LoadFile(wxString Filename){
        int RelatedCount = 0;
        int URLCount = 0;
        int TitleCount = 0;
+       int RoleCount = 0;
+       int OrganisationCount = 0;
+       int NoteCount = 0;
+       int CategoryCount = 0;
+       int PhotoCount = 0;
+       int LogoCount = 0;
+       int SoundCount = 0;
+       int CalendarCount = 0;
+       int CalendarAddressCount = 0;
+       int FreeBusyAddressCount = 0;
+       int KeyCount = 0;
+       int VendorCount = 0;
+       int XTokenCount = 0;
+       int XMLCount = 0;
+       int ClientPIDCount = 0;
        wxString ContactLine;
        wxString PropertyLine;
        wxString PropertySeg1;
@@ -195,6 +213,26 @@ ContactLoadStatus ContactDataObject::LoadFile(wxString Filename){
                                
                        ProcessKind(PropertySeg2);
                
+               } else if (Property == wxT("UID") && UIDProcessed == FALSE){
+               
+                       UIDToken = PropertySeg2;
+                       UIDProcessed = TRUE;
+               
+               } else if (Property == wxT("SOURCE")){
+               
+                       ProcessSource(PropertySeg1, PropertySeg2, &SourceCount);
+                       SourceCount++;
+               
+               } else if (Property == wxT("XML")){
+               
+                       ProcessXML(PropertySeg1, PropertySeg2, &XMLCount);
+                       XMLCount++;
+               
+               } else if (Property == wxT("REV") && RevisionProcessed == FALSE){
+               
+                       ProcessRevision(PropertySeg1, PropertySeg2);
+                       RevisionProcessed = TRUE;
+               
                } else if (Property == wxT("MEMBER")){
 
                        ProcessMember(PropertySeg1, PropertySeg2, &GroupCount);
@@ -210,6 +248,11 @@ ContactLoadStatus ContactDataObject::LoadFile(wxString Filename){
                        ProcessN(PropertySeg1, PropertySeg2);
                        NameProcessed = TRUE;
                
+               } else if (Property == wxT("CLIENTPIDMAP")){
+               
+                       ProcessClientPIDMap(PropertySeg1, PropertySeg2, &ClientPIDCount);
+                       ClientPIDCount++;
+               
                } else if (Property == wxT("NICKNAME")){
                                                
                        ProcessNickname(PropertySeg1, PropertySeg2, &NicknameCount);
@@ -290,6 +333,99 @@ ContactLoadStatus ContactDataObject::LoadFile(wxString Filename){
                        ProcessTitle(PropertySeg1, PropertySeg2, &TitleCount);
                        TitleCount++;
                        
+               } else if (Property == wxT("ROLE")) {
+               
+                       // See frmContactEditor-LoadTitle.cpp
+                       
+                       ProcessRole(PropertySeg1, PropertySeg2, &RoleCount);
+                       RoleCount++;
+                       
+               } else if (Property == wxT("ORG")) {
+               
+                       // See frmContactEditor-LoadOrg.cpp
+                       
+                       ProcessOrganisation(PropertySeg1, PropertySeg2, &OrganisationCount);
+                       OrganisationCount++;
+                       
+               } else if (Property == wxT("NOTE")) {
+
+                       // See frmContactEditor-LoadNote.cpp
+
+                       ProcessNote(PropertySeg1, PropertySeg2, &NoteCount);
+                       NoteCount++;    
+                       
+               } else if (Property == wxT("CATEGORIES")) {
+               
+                       // See frmContactEditor-LoadCategory.cpp
+               
+                       ProcessCategory(PropertySeg1, PropertySeg2, &CategoryCount);    
+                       CategoryCount++;
+                       
+               } else if (Property == wxT("PHOTO")) {
+               
+                       // See frmContactEditor-LoadPhoto.cpp
+                       
+                       ProcessPhoto(PropertySeg1, PropertySeg2, &PhotoCount);
+                       PhotoCount++;
+
+               } else if (Property == wxT("LOGO")) {
+               
+                       // See frmContactEditor-LoadPhoto.cpp
+                       
+                       ProcessLogo(PropertySeg1, PropertySeg2, &LogoCount);
+                       LogoCount++;
+
+               } else if (Property == wxT("LOGO")) {
+               
+                       // See frmContactEditor-LoadPhoto.cpp
+                       
+                       ProcessLogo(PropertySeg1, PropertySeg2, &LogoCount);
+                       LogoCount++;
+
+               } else if (Property == wxT("SOUND")) {
+               
+                       // See frmContactEditor-LoadSound.cpp
+                       
+                       ProcessSound(PropertySeg1, PropertySeg2, &SoundCount);
+                       SoundCount++;
+                       
+               } else if (Property == wxT("CALURI")){
+
+                       // See frmContactEditor-LoadCalendar.cpp
+                       
+                       ProcessCalendarURI(PropertySeg1, PropertySeg2, &CalendarCount);
+                       CalendarCount++;
+               
+               } else if (Property == wxT("CALADRURI")){
+               
+                       ProcessCalendarAddressURI(PropertySeg1, PropertySeg2, &CalendarAddressCount);
+                       CalendarAddressCount++;
+               
+               } else if (Property == wxT("FBURL")){
+
+                       // See frmContactEditor-LoadCalendar.cpp
+
+                       ProcessCalendarFreeBusy(PropertySeg1, PropertySeg2, &FreeBusyAddressCount);
+                       FreeBusyAddressCount++;
+
+               } else if (Property == wxT("KEY")){
+               
+                       // See frmContactEditor-LoadKey.cpp
+                       
+                       ProcessKey(PropertySeg1, PropertySeg2, &KeyCount);
+                       KeyCount++;
+               
+               } else if (Property.Mid(0, 3) == wxT("VND")){
+               
+                       ProcessVendor(PropertySeg1, PropertySeg2, &VendorCount);
+                       VendorCount++;
+               
+               } else if (Property.Mid(0, 2) == wxT("X-")){
+                       
+                       XTokenList.insert(std::make_pair(XTokenCount, PropertySeg2));
+                       XTokenListTokens.insert(std::make_pair(XTokenCount, PropertySeg1.Mid(2)));
+                       XTokenCount++;
+               
                }
                
        }
@@ -323,26 +459,27 @@ void ContactDataObject::ProcessKind(wxString KindType){
 
 }
 
-void ContactDataObject::ProcessMember(wxString PropertySeg1, wxString PropertySeg2, int *GroupCount){
+void ContactDataObject::ProcessRevision(wxString PropertySeg1, wxString PropertySeg2){
 
+       size_t intPropertyLen = PropertySeg1.Len();
        std::map<int, int> SplitPoints;
        std::map<int, int> SplitLength;
-
-       int intPrevValue = 8;
-       int intPref = 0;                        
-       int intType = 0;
-       
-       SplitValues(&PropertySeg1, &SplitPoints, &SplitLength, intPrevValue);
-
-       intPrevValue = 7;
-       
+       std::map<int, int>::iterator SLiter;                    
+       wxString PropertyData;
        wxString PropertyName;
        wxString PropertyValue;
-       wxString PropertyData;
        wxString PropertyTokens;
-       std::map<int,int>::iterator SLiter;
        bool FirstToken = TRUE;
+       int intSplitsFound = 0;
+       int intSplitSize = 0;
+       int intPrevValue = 5;
+       int intPref = 0;                        
+       int intType = 0;
+       
+       SplitValues(&PropertySeg1, &SplitPoints, &SplitLength, intPrevValue);
        
+       intPrevValue = 4;
+
        for (std::map<int, int>::iterator intiter = SplitPoints.begin(); 
        intiter != SplitPoints.end(); ++intiter){
        
@@ -356,91 +493,81 @@ void ContactDataObject::ProcessMember(wxString PropertySeg1, wxString PropertySe
                
                intPrevValue = intiter->second;
                
-               CaptureString(&PropertyValue, FALSE);
-       
-               if (PropertyName == wxT("ALTID")){
-
-                       GroupsListAltID.erase(*GroupCount);
-                       GroupsListAltID.insert(std::make_pair(*GroupCount, PropertyValue));
+               // Process properties.
                
-               } else if (PropertyName == wxT("PID")){
-
-                       GroupsListPID.erase(*GroupCount);
-                       GroupsListPID.insert(std::make_pair(*GroupCount, PropertyValue));
+               size_t intPropertyValueLen = PropertyValue.Len();
                
-               } else if (PropertyName == wxT("PREF")){
-
-                       int PriorityNumber = 0;
-                       bool ValidNumber = TRUE;
+               if (PropertyValue.Mid((intPropertyValueLen - 1), 1) == wxT("\"")){
                        
-                       try{
-                               PriorityNumber = std::stoi(PropertyValue.ToStdString());
-                       }
+                       PropertyValue.Trim();
+                       PropertyValue.RemoveLast();
                        
-                       catch(std::invalid_argument &e){
-                               ValidNumber = FALSE;
-                       }
-
-                       if (ValidNumber == TRUE){
-
-                               GroupsListPref.erase(*GroupCount);
-                               GroupsListPref.insert(std::make_pair(*GroupCount, PriorityNumber));
-               
-                       }
-               
-               } else if (PropertyName == wxT("MEDIATYPE")){
-
-                       GroupsListMediaType.erase(*GroupCount);
-                       GroupsListMediaType.insert(std::make_pair(*GroupCount, PropertyValue));
+               }                               
                
-               } else if (!PropertyName.IsEmpty() && !PropertyValue.IsEmpty()){
+               if (PropertyValue.Mid(0, 1) == wxT("\"")){
                        
-                       if (FirstToken == TRUE){
+                       PropertyValue.Remove(0, 1);
+                       
+               }                       
+               
+               CaptureString(&PropertyValue, FALSE);
+                                                               
+               if (FirstToken == TRUE){
                                
-                               PropertyTokens.Append(PropertyName + wxT("=") + PropertyValue);
-                               FirstToken = FALSE;
+                       PropertyTokens.Append(PropertyName + wxT("=") + PropertyValue);
+                       FirstToken = FALSE;
                                
-                       } else {
-                       
-                               PropertyTokens.Append(wxT(";") + PropertyName + wxT("=") + PropertyValue);
+               } else {
+                               
+                       PropertyTokens.Append(wxT(";") + PropertyName + wxT("=") + PropertyValue);
                                
-                       }
-                       
                }
-               
-       }
-
-       GroupsList.insert(std::make_pair(*GroupCount, PropertySeg2));
-
+       
+       }       
+       
+       CaptureString(&PropertySeg2, FALSE);
+       
+       Revision = PropertySeg2;
+       
        if (!PropertyTokens.IsEmpty()){
        
-               GroupsListTokens.insert(std::make_pair(*GroupCount, PropertyTokens));
+               RevisionTokens = PropertyTokens;
        
        }
 
 
 }
 
-void ContactDataObject::ProcessFN(wxString PropertySeg1, wxString PropertySeg2, int *FNCount){
+void ContactDataObject::ProcessSource(wxString PropertySeg1, wxString PropertySeg2, int *SourceCount){
 
+       size_t intPropertyLen = PropertySeg1.Len();
        std::map<int, int> SplitPoints;
        std::map<int, int> SplitLength;
-
-       int intPrevValue = 4;
+       std::map<int, int>::iterator SLiter;                    
+       wxString PropertyData;
+       wxString PropertyName;
+       wxString PropertyValue;
+       wxString PropertyTokens;
+       bool FirstToken = TRUE;
+       bool PropertyMatched = FALSE;
+       int intSplitsFound = 0;
+       int intSplitSize = 0;
+       int intPrevValue = 8;
        int intPref = 0;                        
        int intType = 0;
        
        SplitValues(&PropertySeg1, &SplitPoints, &SplitLength, intPrevValue);
-
-       intPrevValue = 3;
        
-       wxString PropertyName;
-       wxString PropertyValue;
-       wxString PropertyData;
-       wxString PropertyTokens;
-       std::map<int,int>::iterator SLiter;
-       bool FirstToken = TRUE;
+       intPrevValue = 7;
        
+       PropertyType PropType = PROPERTY_NONE;
+       
+       // Look for type before continuing.                     
+
+       CheckType(&PropertySeg1, &SplitPoints, &SplitLength, &intPrevValue, &PropType);
+
+       intPrevValue = 7;
+
        for (std::map<int, int>::iterator intiter = SplitPoints.begin(); 
        intiter != SplitPoints.end(); ++intiter){
        
@@ -454,92 +581,98 @@ void ContactDataObject::ProcessFN(wxString PropertySeg1, wxString PropertySeg2,
                
                intPrevValue = intiter->second;
                
-               CaptureString(&PropertyValue, FALSE);
+               // Process properties.
                
-               if (PropertyName == wxT("TYPE")){
-
-                       if (!PropertyValue.IsEmpty() || PropertyValue == wxT("home") ||
-                               PropertyValue == wxT("work") ){
-
-                               FullNamesListType.erase(*FNCount);
-                               FullNamesListType.insert(std::make_pair(*FNCount, PropertyValue));
+               size_t intPropertyValueLen = PropertyValue.Len();
                
-                       }
+               if (PropertyValue.Mid((intPropertyValueLen - 1), 1) == wxT("\"")){
+                       
+                       PropertyValue.Trim();
+                       PropertyValue.RemoveLast();
+                       
+               }                               
                
-               } else if (PropertyName == wxT("LANGUAGE")){
-
-                       FullNamesListLanguage.erase(*FNCount);
-                       FullNamesListLanguage.insert(std::make_pair(*FNCount, PropertyValue));
+               if (PropertyValue.Mid(0, 1) == wxT("\"")){
+                       
+                       PropertyValue.Remove(0, 1);
+                       
+               }                       
                
-               } else if (PropertyName == wxT("ALTID")){
+               CaptureString(&PropertyValue, FALSE);
                
-                       FullNamesListAltID.erase(*FNCount);
-                       FullNamesListAltID.insert(std::make_pair(*FNCount, PropertyValue));
+               ProcessStringValue(&PropertyName, "ALTID", &SourceListAltID, &PropertyValue, SourceCount, &PropertyMatched);
+               ProcessStringValue(&PropertyName, "PID", &SourceListPID, &PropertyValue, SourceCount, &PropertyMatched);
+               ProcessStringValue(&PropertyName, "MEDIATYPE", &SourceListMediatype, &PropertyValue, SourceCount, &PropertyMatched);
+               ProcessIntegerValue(&PropertyName, "PREF", &SourceListPref, &PropertyValue, SourceCount, &PropertyMatched);
                
-               } else if (PropertyName == wxT("PID")){
-
-                       FullNamesListPID.erase(*FNCount);
-                       FullNamesListPID.insert(std::make_pair(*FNCount, PropertyValue));
+               if (PropertyMatched == TRUE){
                
-               } else if (PropertyName == wxT("PREF")){
-
-                       int PriorityNumber = 0;
-                       bool ValidNumber = TRUE;
-                       
-                       try{
-                               PriorityNumber = std::stoi(PropertyValue.ToStdString());
-                       }
-                       
-                       catch(std::invalid_argument &e){
-                               ValidNumber = FALSE;
-                       }
-
-                       if (ValidNumber == TRUE){
-
-                               FullNamesListPref.erase(*FNCount);
-                               FullNamesListPref.insert(std::make_pair(*FNCount, PriorityNumber));
-
-                       }
+                       PropertyMatched = FALSE;
+                       continue;
                
-               } else if (!PropertyName.IsEmpty() && !PropertyValue.IsEmpty()){
+               }
+               
+               if (!PropertyName.IsEmpty() && !PropertyValue.IsEmpty() && PropertyName != wxT("TYPE")){
                        
                        if (FirstToken == TRUE){
                                
                                PropertyTokens.Append(PropertyName + wxT("=") + PropertyValue);
                                FirstToken = FALSE;
-                               
+                       
                        } else {
                        
                                PropertyTokens.Append(wxT(";") + PropertyName + wxT("=") + PropertyValue);
-                               
-                       }
                        
-               } 
+                       }
+               
+               }
+       
+       }       
+       
+       intPropertyLen = PropertySeg2.Len();
+       SplitPoints.clear();
+       SplitLength.clear();
+       intSplitsFound = 0;
+       intSplitSize = 0;
+       intPrevValue = 0;
        
+       CaptureString(&PropertySeg2, FALSE);
+       
+       // Add the data to the General/Home/Work address variables.
+               
+       switch(PropType){
+               case PROPERTY_NONE:
+                       break;
+               case PROPERTY_HOME:
+                       SourceListType.insert(std::make_pair(*SourceCount, "home"));
+                       break;
+               case PROPERTY_WORK:
+                       SourceListType.insert(std::make_pair(*SourceCount, "work"));
+                       break;
        }
-
-       FullNamesList.insert(std::make_pair(*FNCount, PropertySeg2));
-
+       
+       SourceList.insert(std::make_pair(*SourceCount, PropertySeg2));
+       
        if (!PropertyTokens.IsEmpty()){
        
-               FullNamesListTokens.insert(std::make_pair(*FNCount, PropertyTokens));
+               SourceListTokens.insert(std::make_pair(*SourceCount, PropertyTokens));
        
        }
 
 }
 
-void ContactDataObject::ProcessN(wxString PropertySeg1, wxString PropertySeg2){
+void ContactDataObject::ProcessXML(wxString PropertySeg1, wxString PropertySeg2, int *XMLCount){
 
        std::map<int, int> SplitPoints;
        std::map<int, int> SplitLength;
 
-       int intPrevValue = 3;
+       int intPrevValue = 5;
        int intPref = 0;                        
        int intType = 0;
        
        SplitValues(&PropertySeg1, &SplitPoints, &SplitLength, intPrevValue);
-       
-       intPrevValue = 2;
+
+       intPrevValue = 4;
        
        wxString PropertyName;
        wxString PropertyValue;
@@ -547,6 +680,7 @@ void ContactDataObject::ProcessN(wxString PropertySeg1, wxString PropertySeg2){
        wxString PropertyTokens;
        std::map<int,int>::iterator SLiter;
        bool FirstToken = TRUE;
+       bool PropertyMatched = FALSE;
        
        for (std::map<int, int>::iterator intiter = SplitPoints.begin(); 
        intiter != SplitPoints.end(); ++intiter){
@@ -562,27 +696,242 @@ void ContactDataObject::ProcessN(wxString PropertySeg1, wxString PropertySeg2){
                intPrevValue = intiter->second;
                
                CaptureString(&PropertyValue, FALSE);
+       
+               ProcessStringValue(&PropertyName, "ALTID", &XMLListAltID, &PropertyValue, XMLCount, &PropertyMatched);
                
-               if (PropertyName == wxT("ALTID")){
-
-                       NameAltID = PropertyValue;
-               
-               } else if (PropertyName == wxT("LANGUAGE")){
-               
-                       NameLanguage = PropertyValue;
+               if (PropertyMatched == TRUE){
                
-               } else if (PropertyName == wxT("SORT-AS")){
+                       PropertyMatched = FALSE;
+                       continue;
                
-                       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);
+       }
+
+       XMLList.insert(std::make_pair(*XMLCount, PropertySeg2));
+
+}
+
+void ContactDataObject::ProcessMember(wxString PropertySeg1, wxString PropertySeg2, int *GroupCount){
+
+       std::map<int, int> SplitPoints;
+       std::map<int, int> SplitLength;
+
+       int intPrevValue = 8;
+       int intPref = 0;                        
+       int intType = 0;
+       
+       SplitValues(&PropertySeg1, &SplitPoints, &SplitLength, intPrevValue);
+
+       intPrevValue = 7;
+       
+       wxString PropertyName;
+       wxString PropertyValue;
+       wxString PropertyData;
+       wxString PropertyTokens;
+       std::map<int,int>::iterator SLiter;
+       bool FirstToken = TRUE;
+       bool PropertyMatched = FALSE;
+       
+       for (std::map<int, int>::iterator intiter = SplitPoints.begin(); 
+       intiter != SplitPoints.end(); ++intiter){
+       
+               SLiter = SplitLength.find(intiter->first);
+       
+               PropertyData = PropertySeg1.Mid(intPrevValue, (SLiter->second));
+               
+               wxStringTokenizer PropertyElement (PropertyData, wxT("="));
+               PropertyName = PropertyElement.GetNextToken();                          
+               PropertyValue = PropertyElement.GetNextToken();
+               
+               intPrevValue = intiter->second;
+               
+               CaptureString(&PropertyValue, FALSE);
+       
+               ProcessStringValue(&PropertyName, "ALTID", &GroupsListAltID, &PropertyValue, GroupCount, &PropertyMatched);
+               ProcessStringValue(&PropertyName, "PID", &GroupsListPID, &PropertyValue, GroupCount, &PropertyMatched);
+               ProcessStringValue(&PropertyName, "MEDIATYPE", &GroupsListMediaType, &PropertyValue, GroupCount, &PropertyMatched);
+               ProcessIntegerValue(&PropertyName, "PREF", &GroupsListPref, &PropertyValue, GroupCount, &PropertyMatched);
+               
+               if (PropertyMatched == TRUE){
+               
+                       PropertyMatched = FALSE;
+                       continue;
+               
+               }
+               
+               if (!PropertyName.IsEmpty() && !PropertyValue.IsEmpty()){
+                       
+                       if (FirstToken == TRUE){
+                               
+                               PropertyTokens.Append(PropertyName + wxT("=") + PropertyValue);
+                               FirstToken = FALSE;
+                               
+                       } else {
+                       
+                               PropertyTokens.Append(wxT(";") + PropertyName + wxT("=") + PropertyValue);
+                               
+                       }
+                       
+               }
+               
+       }
+
+       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){
+
+       std::map<int, int> SplitPoints;
+       std::map<int, int> SplitLength;
+
+       int intPrevValue = 4;
+       int intPref = 0;                        
+       int intType = 0;
+       
+       SplitValues(&PropertySeg1, &SplitPoints, &SplitLength, intPrevValue);
+
+       intPrevValue = 3;
+       
+       wxString PropertyName;
+       wxString PropertyValue;
+       wxString PropertyData;
+       wxString PropertyTokens;
+       std::map<int,int>::iterator SLiter;
+       bool FirstToken = TRUE;
+       bool PropertyMatched = FALSE;
+       
+       for (std::map<int, int>::iterator intiter = SplitPoints.begin(); 
+       intiter != SplitPoints.end(); ++intiter){
+       
+               SLiter = SplitLength.find(intiter->first);
+       
+               PropertyData = PropertySeg1.Mid(intPrevValue, (SLiter->second));
+               
+               wxStringTokenizer PropertyElement (PropertyData, wxT("="));
+               PropertyName = PropertyElement.GetNextToken();                          
+               PropertyValue = PropertyElement.GetNextToken();
+               
+               intPrevValue = intiter->second;
+               
+               CaptureString(&PropertyValue, FALSE);
+               
+               if (PropertyName == wxT("TYPE")){
+
+                       if (!PropertyValue.IsEmpty() || PropertyValue == wxT("home") ||
+                               PropertyValue == wxT("work") ){
+
+                               FullNamesListType.erase(*FNCount);
+                               FullNamesListType.insert(std::make_pair(*FNCount, PropertyValue));
+               
+                       }
+                       
+                       PropertyMatched = TRUE;
+               
+               }
+               
+               ProcessStringValue(&PropertyName, "ALTID", &FullNamesListAltID, &PropertyValue, FNCount, &PropertyMatched);
+               ProcessStringValue(&PropertyName, "PID", &FullNamesListPID, &PropertyValue, FNCount, &PropertyMatched);
+               ProcessStringValue(&PropertyName, "LANGUAGE", &FullNamesListLanguage, &PropertyValue, FNCount, &PropertyMatched);
+               ProcessIntegerValue(&PropertyName, "PREF", &FullNamesListPref, &PropertyValue, FNCount, &PropertyMatched);
+               
+               if (PropertyMatched == TRUE){
+               
+                       PropertyMatched = FALSE;
+                       continue;
+               
+               }
+               
+               if (!PropertyName.IsEmpty() && !PropertyValue.IsEmpty()){
+                       
+                       if (FirstToken == TRUE){
+                               
+                               PropertyTokens.Append(PropertyName + wxT("=") + PropertyValue);
+                               FirstToken = FALSE;
+                               
+                       } else {
+                       
+                               PropertyTokens.Append(wxT(";") + PropertyName + wxT("=") + PropertyValue);
+                               
+                       }
+                       
+               } 
+       
+       }
+
+       FullNamesList.insert(std::make_pair(*FNCount, PropertySeg2));
+
+       if (!PropertyTokens.IsEmpty()){
+       
+               FullNamesListTokens.insert(std::make_pair(*FNCount, PropertyTokens));
+       
+       }
+
+}
+
+void ContactDataObject::ProcessN(wxString PropertySeg1, wxString PropertySeg2){
+
+       std::map<int, int> SplitPoints;
+       std::map<int, int> SplitLength;
+
+       int intPrevValue = 3;
+       int intPref = 0;                        
+       int intType = 0;
+       
+       SplitValues(&PropertySeg1, &SplitPoints, &SplitLength, intPrevValue);
+       
+       intPrevValue = 2;
+       
+       wxString PropertyName;
+       wxString PropertyValue;
+       wxString PropertyData;
+       wxString PropertyTokens;
+       std::map<int,int>::iterator SLiter;
+       bool FirstToken = TRUE;
+       
+       for (std::map<int, int>::iterator intiter = SplitPoints.begin(); 
+       intiter != SplitPoints.end(); ++intiter){
+       
+               SLiter = SplitLength.find(intiter->first);
+       
+               PropertyData = PropertySeg1.Mid(intPrevValue, (SLiter->second));
+               
+               wxStringTokenizer PropertyElement (PropertyData, wxT("="));
+               PropertyName = PropertyElement.GetNextToken();                          
+               PropertyValue = PropertyElement.GetNextToken();
+               
+               intPrevValue = intiter->second;
+               
+               CaptureString(&PropertyValue, FALSE);
+               
+               if (PropertyName == wxT("ALTID")){
+
+                       NameAltID = PropertyValue;
+               
+               } else if (PropertyName == wxT("LANGUAGE")){
+               
+                       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 {
@@ -683,21 +1032,88 @@ void ContactDataObject::ProcessN(wxString PropertySeg1, wxString PropertySeg2){
 
 }
 
-void ContactDataObject::ProcessNickname(wxString PropertySeg1, wxString PropertySeg2, int *NicknameCount){
+void ContactDataObject::ProcessClientPIDMap(wxString PropertySeg1, wxString PropertySeg2, int *ClientPIDCount){
 
+       size_t intPropertyLen = PropertySeg1.Len();
        std::map<int, int> SplitPoints;
        std::map<int, int> SplitLength;
-
-       int intPrevValue = 10;
+       std::map<int, int>::iterator SLiter;                    
+       wxString PropertyData;
+       wxString PropertyName;
+       wxString PropertyValue;
+       wxString PropertyTokens;
+       bool FirstToken = TRUE;
+       int intSplitsFound = 0;
+       int intSplitSize = 0;
+       int intPrevValue = 14;
        int intPref = 0;                        
+       int intType = 0;
        
        SplitValues(&PropertySeg1, &SplitPoints, &SplitLength, intPrevValue);
        
-       intPrevValue = 9;
+       intPrevValue = 13;
+
+       for (std::map<int, int>::iterator intiter = SplitPoints.begin(); 
+       intiter != SplitPoints.end(); ++intiter){
        
-       PropertyType PropType = PROPERTY_NONE;
+               SLiter = SplitLength.find(intiter->first);
        
-       // Look for type before continuing.
+               PropertyData = PropertySeg1.Mid(intPrevValue, (SLiter->second));
+               
+               wxStringTokenizer PropertyElement (PropertyData, wxT("="));
+               PropertyName = PropertyElement.GetNextToken();                          
+               PropertyValue = PropertyElement.GetNextToken();
+               
+               intPrevValue = intiter->second;
+               
+               // Process properties.
+                               
+               CaptureString(&PropertyValue, FALSE);
+                                       
+               if (!PropertyName.IsEmpty() && !PropertyValue.IsEmpty()){
+                                                       
+                       if (FirstToken == TRUE){
+                               
+                               PropertyTokens.Append(PropertyName + wxT("=") + PropertyValue);
+                               FirstToken = FALSE;
+                               
+                       } else {
+                               
+                               PropertyTokens.Append(wxT(";") + PropertyName + wxT("=") + PropertyValue);
+                               
+                       }
+               
+               }
+       
+       }       
+       
+       CaptureString(&PropertySeg2, FALSE);
+       
+       ClientPIDList.insert(std::make_pair(*ClientPIDCount, PropertySeg2));
+       
+       if (!PropertyTokens.IsEmpty()){
+       
+               ClientPIDListTokens.insert(std::make_pair(*ClientPIDCount, PropertyTokens));
+       
+       }
+
+}
+
+void ContactDataObject::ProcessNickname(wxString PropertySeg1, wxString PropertySeg2, int *NicknameCount){
+
+       std::map<int, int> SplitPoints;
+       std::map<int, int> SplitLength;
+
+       int intPrevValue = 10;
+       int intPref = 0;                        
+       
+       SplitValues(&PropertySeg1, &SplitPoints, &SplitLength, intPrevValue);
+       
+       intPrevValue = 9;
+       
+       PropertyType PropType = PROPERTY_NONE;
+       
+       // Look for type before continuing.
        
        CheckType(&PropertySeg1, &SplitPoints, &SplitLength, &intPrevValue, &PropType);
        
@@ -747,6 +1163,7 @@ void ContactDataObject::ProcessNickname(wxString PropertySeg1, wxString Property
        wxString PropertyValue;
        wxString PropertyTokens;
        bool FirstToken = TRUE;
+       bool PropertyMatched = FALSE;
        
        for (std::map<int, int>::iterator intiter = SplitPoints.begin(); 
        intiter != SplitPoints.end(); ++intiter){
@@ -763,61 +1180,31 @@ void ContactDataObject::ProcessNickname(wxString PropertySeg1, wxString Property
                
                CaptureString(&PropertyValue, FALSE);
                
-               if (PropertyName == wxT("ALTID")){
-
-                       NicknamesListAltID->erase(*NicknameCount);
-                       NicknamesListAltID->insert(std::make_pair(*NicknameCount, PropertyValue));
+               ProcessStringValue(&PropertyName, "ALTID", NicknamesListAltID, &PropertyValue, NicknameCount, &PropertyMatched);
+               ProcessStringValue(&PropertyName, "PID", NicknamesListPID, &PropertyValue, NicknameCount, &PropertyMatched);
+               ProcessStringValue(&PropertyName, "LANGUAGE", NicknamesListLanguage, &PropertyValue, NicknameCount, &PropertyMatched);
+               ProcessIntegerValue(&PropertyName, "PREF", NicknamesListPref, &PropertyValue, NicknameCount, &PropertyMatched);
                
-               } else if (PropertyName == wxT("PID")){
-
-                       NicknamesListPID->erase(*NicknameCount);
-                       NicknamesListPID->insert(std::make_pair(*NicknameCount, PropertyValue));        
-
-               } else if (PropertyName == wxT("PREF")){
-
-                       int PriorityNumber = 0;
-                       bool ValidNumber = TRUE;
-                       
-                       try{
-                               PriorityNumber = std::stoi(PropertyValue.ToStdString());
-                       }
-                       
-                       catch(std::invalid_argument &e){
-                               ValidNumber = FALSE;
-                       }
-
-                       if (ValidNumber == TRUE){
-
-                               NicknamesListPref->erase(*NicknameCount);
-                               NicknamesListPref->insert(std::make_pair(*NicknameCount, PriorityNumber));
-
-                       }
+               if (PropertyMatched == TRUE){
                
-               } else if (PropertyName == wxT("LANGUAGE")){
-
-                       NicknamesListLanguage->erase(*NicknameCount);
-                       NicknamesListLanguage->insert(std::make_pair(*NicknameCount, PropertyValue));   
-
-               } else {
+                       PropertyMatched = FALSE;
+                       continue;
                
-                       // Something else we don't know about so append
-                       // to the tokens variable.
+               }
                
-                       if (!PropertyName.IsEmpty() && !PropertyValue.IsEmpty() && PropertyName != wxT("TYPE")){
+               if (!PropertyName.IsEmpty() && !PropertyValue.IsEmpty() && PropertyName != wxT("TYPE")){
+       
+                       if (FirstToken == TRUE){
                
-                               if (FirstToken == TRUE){
-                       
-                                       PropertyTokens.Append(PropertyName + wxT("=") + PropertyValue);
-                                       FirstToken = FALSE;
-                       
-                               } else {
-                       
-                                       PropertyTokens.Append(wxT(";") + PropertyName + wxT("=") + PropertyValue);
-                       
-                               }
+                               PropertyTokens.Append(PropertyName + wxT("=") + PropertyValue);
+                               FirstToken = FALSE;
                
-                       }
+                       } else {
                
+                               PropertyTokens.Append(wxT(";") + PropertyName + wxT("=") + PropertyValue);
+               
+                       }
+       
                }
                
        }
@@ -1238,6 +1625,7 @@ void ContactDataObject::ProcessTimeZone(wxString PropertySeg1, wxString Property
        wxString PropertyValue;
        wxString PropertyTokens;
        bool FirstToken = TRUE;
+       bool PropertyMatched = FALSE;
        
        for (std::map<int, int>::iterator intiter = SplitPoints.begin(); 
        intiter != SplitPoints.end(); ++intiter){
@@ -1254,61 +1642,31 @@ void ContactDataObject::ProcessTimeZone(wxString PropertySeg1, wxString Property
                
                CaptureString(&PropertyValue, FALSE);
 
-               if (PropertyName == wxT("ALTID")){
-
-                       TZListAltID->erase(*TimeZoneCount);
-                       TZListAltID->insert(std::make_pair(*TimeZoneCount, PropertyValue));
+               ProcessStringValue(&PropertyName, "ALTID", TZListAltID, &PropertyValue, TimeZoneCount, &PropertyMatched);
+               ProcessStringValue(&PropertyName, "PID", TZListPID, &PropertyValue, TimeZoneCount, &PropertyMatched);
+               ProcessStringValue(&PropertyName, "MEDIATYPE", TZListMediatype, &PropertyValue, TimeZoneCount, &PropertyMatched);
+               ProcessIntegerValue(&PropertyName, "PREF", TZListPref, &PropertyValue, TimeZoneCount, &PropertyMatched);
                
-               } else if (PropertyName == wxT("PID")){
-
-                       TZListPID->erase(*TimeZoneCount);
-                       TZListPID->insert(std::make_pair(*TimeZoneCount, PropertyValue));       
-
-               } else if (PropertyName == wxT("PREF")){
-
-                       int PriorityNumber = 0;
-                       bool ValidNumber = TRUE;
-                       
-                       try{
-                               PriorityNumber = std::stoi(PropertyValue.ToStdString());
-                       }
-                       
-                       catch(std::invalid_argument &e){
-                               ValidNumber = FALSE;
-                       }
-
-                       if (ValidNumber == TRUE){
-
-                               TZListPref->erase(*TimeZoneCount);
-                               TZListPref->insert(std::make_pair(*TimeZoneCount, PriorityNumber));
-
-                       }
+               if (PropertyMatched == TRUE){
                
-               } else if (PropertyName == wxT("MEDIATYPE")){
-
-                       TZListMediatype->erase(*TimeZoneCount);
-                       TZListMediatype->insert(std::make_pair(*TimeZoneCount, PropertyValue)); 
+                       PropertyMatched = FALSE;
+                       continue;
+               
+               }
 
-               } else {
+               if (!PropertyName.IsEmpty() && !PropertyValue.IsEmpty() && PropertyName != wxT("TYPE")){
+       
+                       if (FirstToken == TRUE){
                
-                       // Something else we don't know about so append
-                       // to the tokens variable.
+                               PropertyTokens.Append(PropertyName + wxT("=") + PropertyValue);
+                               FirstToken = FALSE;
                
-                       if (!PropertyName.IsEmpty() && !PropertyValue.IsEmpty() && PropertyName != wxT("TYPE")){
+                       } else {
                
-                               if (FirstToken == TRUE){
-                       
-                                       PropertyTokens.Append(PropertyName + wxT("=") + PropertyValue);
-                                       FirstToken = FALSE;
-                       
-                               } else {
-                       
-                                       PropertyTokens.Append(wxT(";") + PropertyName + wxT("=") + PropertyValue);
-                       
-                               }
+                               PropertyTokens.Append(wxT(";") + PropertyName + wxT("=") + PropertyValue);
                
                        }
-               
+       
                }
                
        }
@@ -1360,6 +1718,7 @@ void ContactDataObject::ProcessAddress(wxString PropertySeg1, wxString PropertyS
        int intPref = 0;                        
        int intType = 0;
        long ListCtrlIndex;
+       bool PropertyMatched = FALSE;
        
        SplitValues(&PropertySeg1, &SplitPoints, &SplitLength, intPrevValue);
        
@@ -1462,78 +1821,35 @@ void ContactDataObject::ProcessAddress(wxString PropertySeg1, wxString PropertyS
                
                // Process properties.
                
-               if (PropertyName == wxT("LABEL")){
-               
-                       AddressListLabel->erase(*AddressCount);
-                       AddressListLabel->insert(std::make_pair(*AddressCount, PropertyValue));
-                               
-               } else if (PropertyName == wxT("LANGUAGE")){
-               
-                       AddressListLang->erase(*AddressCount);
-                       AddressListLang->insert(std::make_pair(*AddressCount, PropertyValue));                  
-               
-               } else if (PropertyName == wxT("ALTID")){
-
-                       AddressListAltID->erase(*AddressCount);
-                       AddressListAltID->insert(std::make_pair(*AddressCount, PropertyValue));
-               
-               } else if (PropertyName == wxT("PID")){
-
-                       AddressListPID->erase(*AddressCount);
-                       AddressListPID->insert(std::make_pair(*AddressCount, PropertyValue));
+               ProcessStringValue(&PropertyName, "LABEL", AddressListLabel, &PropertyValue, AddressCount, &PropertyMatched);
+               ProcessStringValue(&PropertyName, "LANGUAGE", AddressListLang, &PropertyValue, AddressCount, &PropertyMatched);
+               ProcessStringValue(&PropertyName, "ALTID", AddressListAltID, &PropertyValue, AddressCount, &PropertyMatched);
+               ProcessStringValue(&PropertyName, "PID", AddressListPID, &PropertyValue, AddressCount, &PropertyMatched);
+               ProcessStringValue(&PropertyName, "GEO", AddressListGeo, &PropertyValue, AddressCount, &PropertyMatched);
+               ProcessStringValue(&PropertyName, "TZ", AddressListTimezone, &PropertyValue, AddressCount, &PropertyMatched);
+               ProcessStringValue(&PropertyName, "MEDIATYPE", AddressListMediatype, &PropertyValue, AddressCount, &PropertyMatched);
+               ProcessIntegerValue(&PropertyName, "PREF", AddressListPref, &PropertyValue, AddressCount, &PropertyMatched);
                
-               } else if (PropertyName == wxT("GEO")){
+               if (PropertyMatched == TRUE){
                
-                       AddressListGeo->erase(*AddressCount);
-                       AddressListGeo->insert(std::make_pair(*AddressCount, PropertyValue));
+                       PropertyMatched = FALSE;
+                       continue;
                
-               } else if (PropertyName == wxT("TZ")){
-
-                       AddressListTimezone->erase(*AddressCount);
-                       AddressListTimezone->insert(std::make_pair(*AddressCount, PropertyValue));
+               }
                
-               } else if (PropertyName == wxT("MEDIATYPE")){
-
-                       AddressListMediatype->erase(*AddressCount);
-                       AddressListMediatype->insert(std::make_pair(*AddressCount, PropertyValue));
+               if (!PropertyName.IsEmpty() && !PropertyValue.IsEmpty() && PropertyName != wxT("TYPE")){
                
-               } else if (PropertyName == wxT("PREF")){
-                       
-                       int PriorityNumber = 0;
-                       bool ValidNumber = TRUE;
+                       if (FirstToken == TRUE){
                        
-                       try{
-                               PriorityNumber = std::stoi(PropertyValue.ToStdString());
-                       }
+                               PropertyTokens.Append(PropertyName + wxT("=") + PropertyValue);
+                               FirstToken = FALSE;
                        
-                       catch(std::invalid_argument &e){
-                               ValidNumber = FALSE;
-                       }
-
-                       if (ValidNumber == TRUE){
-
-                               AddressListPref->erase(*AddressCount);
-                               AddressListPref->insert(std::make_pair(*AddressCount, PriorityNumber));
-
-                       }
-               
-               } else {
-               
-                       if (!PropertyName.IsEmpty() && !PropertyValue.IsEmpty() && PropertyName != wxT("TYPE")){
+                       } else {
                        
-                               if (FirstToken == TRUE){
-                               
-                                       PropertyTokens.Append(PropertyName + wxT("=") + PropertyValue);
-                                       FirstToken = FALSE;
-                               
-                               } else {
-                               
-                                       PropertyTokens.Append(wxT(";") + PropertyName + wxT("=") + PropertyValue);
-                               
-                               }
+                               PropertyTokens.Append(wxT(";") + PropertyName + wxT("=") + PropertyValue);
                        
                        }
-               
+                       
                }
        
        }                       
@@ -1585,7 +1901,6 @@ void ContactDataObject::ProcessAddress(wxString PropertySeg1, wxString PropertyS
                        
                        SLiter = SplitLength.find(1);
                                                                
-                       //txtSurname->SetValue(ContactData.Convert(wxSPropertySeg2.Mid(0, SLiter->second), TRUE));
                        AddressPOBox = PropertySeg2.Mid(0, SLiter->second);
                        intPrevValue = intiter->second;
                
@@ -1596,7 +1911,6 @@ void ContactDataObject::ProcessAddress(wxString PropertySeg1, wxString PropertyS
                        SLiter = SplitLength.find(2);
                        
                        AddressExtended = PropertySeg2.Mid(intPrevValue, SLiter->second);
-                       //txtForename->SetValue(ContactData.Convert(wxSPropertySeg2.Mid(intPrevValue, SLiter->second), TRUE));
                        intPrevValue = intiter->second;
                
                } else if (intiter->first == 3){
@@ -1606,7 +1920,6 @@ void ContactDataObject::ProcessAddress(wxString PropertySeg1, wxString PropertyS
                        SLiter = SplitLength.find(3);
                                                                
                        AddressStreet = PropertySeg2.Mid(intPrevValue, SLiter->second);
-                       //txtOtherNames->SetValue(ContactData.Convert(wxSPropertySeg2.Mid(intPrevValue, SLiter->second), TRUE));
                        intPrevValue = intiter->second;
                
                } else if (intiter->first == 4){
@@ -1616,10 +1929,7 @@ void ContactDataObject::ProcessAddress(wxString PropertySeg1, wxString PropertyS
                        SLiter = SplitLength.find(4);
                        
                        AddressLocality = PropertySeg2.Mid(intPrevValue, SLiter->second);
-                       //txtTitle->SetValue(ContactData.Convert(wxSPropertySeg2.Mid(intPrevValue, SLiter->second), TRUE));
                        intPrevValue = intiter->second;
-                       
-                       //txtSuffix->SetValue(ContactData.Convert(wxSPropertySeg2.Mid(intPrevValue), TRUE));
                
                } else if (intiter->first == 5){
                
@@ -1628,10 +1938,8 @@ void ContactDataObject::ProcessAddress(wxString PropertySeg1, wxString PropertyS
                        SLiter = SplitLength.find(5);
                        
                        AddressRegion = PropertySeg2.Mid(intPrevValue, SLiter->second);
-                       //txtTitle->SetValue(ContactData.Convert(wxSPropertySeg2.Mid(intPrevValue, SLiter->second), TRUE));
                        intPrevValue = intiter->second;
                        
-                       //txtSuffix->SetValue(ContactData.Convert(wxSPropertySeg2.Mid(intPrevValue), TRUE));
                
                } else if (intiter->first == 6){
                
@@ -1640,14 +1948,12 @@ void ContactDataObject::ProcessAddress(wxString PropertySeg1, wxString PropertyS
                        SLiter = SplitLength.find(6);
                        
                        AddressPostalCode = PropertySeg2.Mid(intPrevValue, SLiter->second);
-                       //txtTitle->SetValue(ContactData.Convert(wxSPropertySeg2.Mid(intPrevValue, SLiter->second), TRUE));
                        intPrevValue = intiter->second;
                        
                        // Deal with country.
                                                
                        AddressCountry = PropertySeg2.Mid(intPrevValue, wxString::npos);
-                       //txtSuffix->SetValue(ContactData.Convert(wxSPropertySeg2.Mid(intPrevValue), TRUE));
-                       
+
                        break;
                
                }
@@ -1750,6 +2056,7 @@ void ContactDataObject::ProcessEmail(wxString PropertySeg1, wxString PropertySeg
        wxString PropertyValue;
        wxString PropertyTokens;
        bool FirstToken = TRUE;
+       bool PropertyMatched = FALSE;
        
        for (std::map<int, int>::iterator intiter = SplitPoints.begin(); 
        intiter != SplitPoints.end(); ++intiter){
@@ -1768,53 +2075,30 @@ void ContactDataObject::ProcessEmail(wxString PropertySeg1, wxString PropertySeg
                
                // Process properties.
                
-               if (PropertyName == wxT("ALTID")){
-
-                       EmailListAltID->erase(*EmailCount);
-                       EmailListAltID->insert(std::make_pair(*EmailCount, PropertyValue));
+               ProcessStringValue(&PropertyName, "ALTID", EmailListAltID, &PropertyValue, EmailCount, &PropertyMatched);
+               ProcessStringValue(&PropertyName, "PID", EmailListPID, &PropertyValue, EmailCount, &PropertyMatched);
+               ProcessIntegerValue(&PropertyName, "PREF", EmailListPref, &PropertyValue, EmailCount, &PropertyMatched);
                
-               } else if (PropertyName == wxT("PID")){
-
-                       EmailListPID->erase(*EmailCount);
-                       EmailListPID->insert(std::make_pair(*EmailCount, PropertyValue));
+               if (PropertyMatched == TRUE){
                
-               } else if (PropertyName == wxT("PREF")){
+                       PropertyMatched = FALSE;
+                       continue;
+               
+               }
+               
+               if (!PropertyName.IsEmpty() && !PropertyValue.IsEmpty() && PropertyName != wxT("TYPE")){
                        
-                       int PriorityNumber = 0;
-                       bool ValidNumber = TRUE;
+                       if (FirstToken == TRUE){
                        
-                       try{
-                               PriorityNumber = std::stoi(PropertyValue.ToStdString());
-                       }
+                               PropertyTokens.Append(PropertyName + wxT("=") + PropertyValue);
+                               FirstToken = FALSE;
                        
-                       catch(std::invalid_argument &e){
-                               ValidNumber = FALSE;
-                       }
-
-                       if (ValidNumber == TRUE){
-
-                               EmailListPref->erase(*EmailCount);
-                               EmailListPref->insert(std::make_pair(*EmailCount, PriorityNumber));
-
-                       }
-               
-               } else {
-               
-                       if (!PropertyName.IsEmpty() && !PropertyValue.IsEmpty() && PropertyName != wxT("TYPE")){
+                       } else {
                        
-                               if (FirstToken == TRUE){
-                               
-                                       PropertyTokens.Append(PropertyName + wxT("=") + PropertyValue);
-                                       FirstToken = FALSE;
-                               
-                               } else {
-                               
-                                       PropertyTokens.Append(wxT(";") + PropertyName + wxT("=") + PropertyValue);
-                               
-                               }
+                               PropertyTokens.Append(wxT(";") + PropertyName + wxT("=") + PropertyValue);
                        
                        }
-               
+                       
                }
        
        }
@@ -1896,6 +2180,7 @@ void ContactDataObject::ProcessIM(wxString PropertySeg1, wxString PropertySeg2,
        wxString PropertyValue;
        wxString PropertyTokens;
        bool FirstToken = TRUE;
+       bool PropertyMatched = FALSE;
        
        for (std::map<int, int>::iterator intiter = SplitPoints.begin(); 
        intiter != SplitPoints.end(); ++intiter){
@@ -1912,57 +2197,30 @@ void ContactDataObject::ProcessIM(wxString PropertySeg1, wxString PropertySeg2,
                
                CaptureString(&PropertyValue, FALSE);
                
+               ProcessStringValue(&PropertyName, "ALTID", IMListAltID, &PropertyValue, IMCount, &PropertyMatched);
+               ProcessStringValue(&PropertyName, "PID", IMListPID, &PropertyValue, IMCount, &PropertyMatched);
+               ProcessStringValue(&PropertyName, "MEDIATYPE", IMListMediatype, &PropertyValue, IMCount, &PropertyMatched);
+               ProcessIntegerValue(&PropertyName, "PREF", IMListPref, &PropertyValue, IMCount, &PropertyMatched);
+               
                // Process properties.
                
-               if (PropertyName == wxT("ALTID")){
-
-                       IMListAltID->erase(*IMCount);
-                       IMListAltID->insert(std::make_pair(*IMCount, PropertyValue));
+               if (PropertyMatched == TRUE){
+                       
+                       PropertyMatched = FALSE;
+                       continue;
                
-               } else if (PropertyName == wxT("PID")){
-
-                       IMListPID->erase(*IMCount);
-                       IMListPID->insert(std::make_pair(*IMCount, PropertyValue));
+               }
                
-               } else if (PropertyName == wxT("MEDIATYPE")){
-
-                       IMListMediatype->erase(*IMCount);
-                       IMListMediatype->insert(std::make_pair(*IMCount, PropertyValue));
+               if (!PropertyName.IsEmpty() && !PropertyValue.IsEmpty() && PropertyName != wxT("TYPE")){
                
-               } else if (PropertyName == wxT("PREF")){
-                       
-                       int PriorityNumber = 0;
-                       bool ValidNumber = TRUE;
+                       if (FirstToken == TRUE){
                        
-                       try{
-                               PriorityNumber = std::stoi(PropertyValue.ToStdString());
-                       }
+                               PropertyTokens.Append(PropertyName + wxT("=") + PropertyValue);
+                               FirstToken = FALSE;
                        
-                       catch(std::invalid_argument &e){
-                               ValidNumber = FALSE;
-                       }
-
-                       if (ValidNumber == TRUE){
-
-                               IMListPref->erase(*IMCount);
-                               IMListPref->insert(std::make_pair(*IMCount, PriorityNumber));
-
-                       }
-               
-               } else {
-               
-                       if (!PropertyName.IsEmpty() && !PropertyValue.IsEmpty() && PropertyName != wxT("TYPE")){
+                       } else {
                        
-                               if (FirstToken == TRUE){
-                               
-                                       PropertyTokens.Append(PropertyName + wxT("=") + PropertyValue);
-                                       FirstToken = FALSE;
-                               
-                               } else {
-                               
-                                       PropertyTokens.Append(wxT(";") + PropertyName + wxT("=") + PropertyValue);
-                               
-                               }
+                               PropertyTokens.Append(wxT(";") + PropertyName + wxT("=") + PropertyValue);
                        
                        }
                
@@ -2212,6 +2470,8 @@ void ContactDataObject::ProcessTelephone(wxString PropertySeg1, wxString Propert
 
        intPrevValue = 4;
        
+       bool PropertyMatched = FALSE;
+       
        for (std::map<int, int>::iterator intiter = SplitPoints.begin(); 
        intiter != SplitPoints.end(); ++intiter){
        
@@ -2229,50 +2489,27 @@ void ContactDataObject::ProcessTelephone(wxString PropertySeg1, wxString Propert
                
                // Process properties.
                
-               if (PropertyName == wxT("ALTID")){
-
-                       TelephoneListAltID->erase(*TelephoneCount);
-                       TelephoneListAltID->insert(std::make_pair(*TelephoneCount, PropertyValue));
+               ProcessStringValue(&PropertyName, "ALTID", TelephoneListAltID, &PropertyValue, TelephoneCount, &PropertyMatched);
+               ProcessStringValue(&PropertyName, "PID", TelephoneListPID, &PropertyValue, TelephoneCount, &PropertyMatched);
+               ProcessIntegerValue(&PropertyName, "PREF", TelephoneListPref, &PropertyValue, TelephoneCount, &PropertyMatched);
                
-               } else if (PropertyName == wxT("PID")){
+               if (PropertyMatched == TRUE){
+               
+                       PropertyMatched = FALSE;
+                       continue;
+               
+               }
 
-                       TelephoneListPID->erase(*TelephoneCount);
-                       TelephoneListPID->insert(std::make_pair(*TelephoneCount, PropertyValue));
+               if (!PropertyName.IsEmpty() && !PropertyValue.IsEmpty() && PropertyName != wxT("TYPE")){
                
-               } else if (PropertyName == wxT("PREF")){
+                       if (FirstToken == TRUE){
                        
-                       int PriorityNumber = 0;
-                       bool ValidNumber = TRUE;
+                               PropertyTokens.Append(PropertyName + wxT("=") + PropertyValue);
+                               FirstToken = FALSE;
                        
-                       try{
-                               PriorityNumber = std::stoi(PropertyValue.ToStdString());
-                       }
-                       
-                       catch(std::invalid_argument &e){
-                               ValidNumber = FALSE;
-                       }
-
-                       if (ValidNumber == TRUE){
-
-                               TelephoneListPref->erase(*TelephoneCount);
-                               TelephoneListPref->insert(std::make_pair(*TelephoneCount, PriorityNumber));
-
-                       }
-               
-               } else {
-               
-                       if (!PropertyName.IsEmpty() && !PropertyValue.IsEmpty() && PropertyName != wxT("TYPE")){
-                       
-                               if (FirstToken == TRUE){
-                               
-                                       PropertyTokens.Append(PropertyName + wxT("=") + PropertyValue);
-                                       FirstToken = FALSE;
-                               
-                               } else {
-                               
-                                       PropertyTokens.Append(wxT(";") + PropertyName + wxT("=") + PropertyValue);
-                               
-                               }
+                       } else {
+                       
+                               PropertyTokens.Append(wxT(";") + PropertyName + wxT("=") + PropertyValue);
                        
                        }
                
@@ -2353,6 +2590,7 @@ void ContactDataObject::ProcessLanguage(wxString PropertySeg1, wxString Property
        wxString PropertyValue;
        wxString PropertyTokens;
        bool FirstToken = TRUE;
+       bool PropertyMatched = FALSE;
        
        for (std::map<int, int>::iterator intiter = SplitPoints.begin(); 
        intiter != SplitPoints.end(); ++intiter){
@@ -2371,50 +2609,27 @@ void ContactDataObject::ProcessLanguage(wxString PropertySeg1, wxString Property
                
                // Process properties.
                
-               if (PropertyName == wxT("ALTID")){
+               ProcessStringValue(&PropertyName, "ALTID", LanguageListAltID, &PropertyValue, LanguageCount, &PropertyMatched);
+               ProcessStringValue(&PropertyName, "PID", LanguageListPID, &PropertyValue, LanguageCount, &PropertyMatched);
+               ProcessIntegerValue(&PropertyName, "PREF", LanguageListPref, &PropertyValue, LanguageCount, &PropertyMatched);
 
-                       LanguageListAltID->erase(*LanguageCount);
-                       LanguageListAltID->insert(std::make_pair(*LanguageCount, PropertyValue));
+               if (PropertyMatched == TRUE){
                
-               } else if (PropertyName == wxT("PID")){
-
-                       LanguageListPID->erase(*LanguageCount);
-                       LanguageListPID->insert(std::make_pair(*LanguageCount, PropertyValue));
+                       PropertyMatched = FALSE;
+                       continue;
                
-               } else if (PropertyName == wxT("PREF")){
-                       
-                       int PriorityNumber = 0;
-                       bool ValidNumber = TRUE;
-                       
-                       try{
-                               PriorityNumber = std::stoi(PropertyValue.ToStdString());
-                       }
-                       
-                       catch(std::invalid_argument &e){
-                               ValidNumber = FALSE;
-                       }
-
-                       if (ValidNumber == TRUE){
-
-                               LanguageListPref->erase(*LanguageCount);
-                               LanguageListPref->insert(std::make_pair(*LanguageCount, PriorityNumber));
-
-                       }
+               }
                
-               } else {
+               if (!PropertyName.IsEmpty() && !PropertyValue.IsEmpty() && PropertyName != wxT("TYPE")){
                
-                       if (!PropertyName.IsEmpty() && !PropertyValue.IsEmpty() && PropertyName != wxT("TYPE")){
+                       if (FirstToken == TRUE){
                        
-                               if (FirstToken == TRUE){
-                               
-                                       PropertyTokens.Append(PropertyName + wxT("=") + PropertyValue);
-                                       FirstToken = FALSE;
-                               
-                               } else {
-                               
-                                       PropertyTokens.Append(wxT(";") + PropertyName + wxT("=") + PropertyValue);
-                               
-                               }
+                               PropertyTokens.Append(PropertyName + wxT("=") + PropertyValue);
+                               FirstToken = FALSE;
+                       
+                       } else {
+                       
+                               PropertyTokens.Append(wxT(";") + PropertyName + wxT("=") + PropertyValue);
                        
                        }
                
@@ -2498,6 +2713,7 @@ void ContactDataObject::ProcessGeographic(wxString PropertySeg1, wxString Proper
        wxString PropertyValue;
        wxString PropertyTokens;
        bool FirstToken = TRUE;
+       bool PropertyMatched = FALSE;
        
        for (std::map<int, int>::iterator intiter = SplitPoints.begin(); 
        intiter != SplitPoints.end(); ++intiter){
@@ -2516,55 +2732,28 @@ void ContactDataObject::ProcessGeographic(wxString PropertySeg1, wxString Proper
                
                // Process properties.
                
-               if (PropertyName == wxT("ALTID")){
-
-                       GeopositionListAltID->erase(*GeographicCount);
-                       GeopositionListAltID->insert(std::make_pair(*GeographicCount, PropertyValue));
+               ProcessStringValue(&PropertyName, "ALTID", GeopositionListAltID, &PropertyValue, GeographicCount, &PropertyMatched);
+               ProcessStringValue(&PropertyName, "PID", GeopositionListPID, &PropertyValue, GeographicCount, &PropertyMatched);
+               ProcessStringValue(&PropertyName, "MEDIATYPE", GeopositionListMediatype, &PropertyValue, GeographicCount, &PropertyMatched);
+               ProcessIntegerValue(&PropertyName, "PREF", GeopositionListPref, &PropertyValue, GeographicCount, &PropertyMatched);
                
-               } else if (PropertyName == wxT("PID")){
-
-                       GeopositionListPID->erase(*GeographicCount);
-                       GeopositionListPID->insert(std::make_pair(*GeographicCount, PropertyValue));
+               if (PropertyMatched == TRUE){
                
-               } else if (PropertyName == wxT("MEDIATYPE")){
-
-                       GeopositionListMediatype->erase(*GeographicCount);
-                       GeopositionListMediatype->insert(std::make_pair(*GeographicCount, PropertyValue));
+                       PropertyMatched = FALSE;
+                       continue;
                
-               } else if (PropertyName == wxT("PREF")){
-                       
-                       int PriorityNumber = 0;
-                       bool ValidNumber = TRUE;
-                       
-                       try{
-                               PriorityNumber = std::stoi(PropertyValue.ToStdString());
-                       }
-                       
-                       catch(std::invalid_argument &e){
-                               ValidNumber = FALSE;
-                       }
-
-                       if (ValidNumber == TRUE){
-
-                               GeopositionListPref->erase(*GeographicCount);
-                               GeopositionListPref->insert(std::make_pair(*GeographicCount, PriorityNumber));
-
-                       }
+               }
                
-               } else {
+               if (!PropertyName.IsEmpty() && !PropertyValue.IsEmpty() && PropertyName != wxT("TYPE")){
                
-                       if (!PropertyName.IsEmpty() && !PropertyValue.IsEmpty() && PropertyName != wxT("TYPE")){
+                       if (FirstToken == TRUE){
                        
-                               if (FirstToken == TRUE){
-                               
-                                       PropertyTokens.Append(PropertyName + wxT("=") + PropertyValue);
-                                       FirstToken = FALSE;
-                               
-                               } else {
-                               
-                                       PropertyTokens.Append(wxT(";") + PropertyName + wxT("=") + PropertyValue);
-                               
-                               }
+                               PropertyTokens.Append(PropertyName + wxT("=") + PropertyValue);
+                               FirstToken = FALSE;
+                       
+                       } else {
+                       
+                               PropertyTokens.Append(wxT(";") + PropertyName + wxT("=") + PropertyValue);
                        
                        }
                
@@ -2717,10 +2906,1767 @@ void ContactDataObject::ProcessRelated(wxString PropertySeg1, wxString PropertyS
                
                }
        
-       }
+       }
+       
+       intPrevValue = 8;                       
+       
+       bool PropertyMatched = FALSE;
+       
+       for (std::map<int, int>::iterator intiter = SplitPoints.begin(); 
+       intiter != SplitPoints.end(); ++intiter){
+       
+               SLiter = SplitLength.find(intiter->first);
+       
+               PropertyData = PropertySeg1.Mid(intPrevValue, (SLiter->second));
+               
+               wxStringTokenizer PropertyElement (PropertyData, wxT("="));
+               PropertyName = PropertyElement.GetNextToken();                          
+               PropertyValue = PropertyElement.GetNextToken();
+               
+               intPrevValue = intiter->second;
+               
+               // Process properties.
+               
+               size_t intPropertyValueLen = PropertyValue.Len();
+               
+               if (PropertyValue.Mid((intPropertyValueLen - 1), 1) == wxT("\"")){
+                       
+                       PropertyValue.Trim();
+                       PropertyValue.RemoveLast();
+                       
+               }                               
+               
+               if (PropertyValue.Mid(0, 1) == wxT("\"")){
+                       
+                       PropertyValue.Remove(0, 1);
+                       
+               }
+               
+               CaptureString(&PropertyValue, FALSE);
+                       
+               ProcessStringValue(&PropertyName, "ALTID", &GeneralRelatedListAltID, &PropertyValue, RelatedCount, &PropertyMatched);
+               ProcessStringValue(&PropertyName, "PID", &GeneralRelatedListPID, &PropertyValue, RelatedCount, &PropertyMatched);
+               ProcessStringValue(&PropertyName, "LANGUAGE", &GeneralRelatedListLanguage, &PropertyValue, RelatedCount, &PropertyMatched);
+               ProcessIntegerValue(&PropertyName, "PREF", &GeneralRelatedListPref, &PropertyValue, RelatedCount, &PropertyMatched);
+
+               if (PropertyMatched == TRUE){
+               
+                       PropertyMatched = FALSE;
+                       continue;
+               
+               }
+
+               if (!PropertyName.IsEmpty() && !PropertyValue.IsEmpty() && PropertyName != wxT("TYPE")){
+       
+                       if (FirstToken == TRUE){
+               
+                               PropertyTokens.Append(PropertyName + wxT("=") + PropertyValue);
+                               FirstToken = FALSE;
+               
+                       } else {
+               
+                               PropertyTokens.Append(wxT(";") + PropertyName + wxT("=") + PropertyValue);
+               
+                       }
+       
+               }
+       
+       }                                       
+       
+       // Add the data to the General/Home/Work address variables.
+                               
+       GeneralRelatedList.erase(*RelatedCount);
+       GeneralRelatedListRelType.erase(*RelatedCount);
+       GeneralRelatedListType.erase(*RelatedCount);
+       GeneralRelatedListTokens.erase(*RelatedCount);
+       GeneralRelatedList.insert(std::make_pair(*RelatedCount, PropertySeg2));
+       GeneralRelatedListRelType.insert(std::make_pair(*RelatedCount, RelatedType));                   
+       GeneralRelatedListType.insert(std::make_pair(*RelatedCount, RelatedType));
+       GeneralRelatedListTokens.insert(std::make_pair(*RelatedCount, PropertyTokens));
+
+}
+
+void ContactDataObject::ProcessURL(wxString PropertySeg1, wxString PropertySeg2, int *URLCount){
+
+       std::map<int, int> SplitPoints;
+       std::map<int, int> SplitLength;
+       std::map<int, int>::iterator SLiter;                    
+       wxString PropertyData;
+       wxString PropertyName;
+       wxString PropertyValue;
+       wxString PropertyTokens;
+       bool FirstToken = TRUE;
+       int intPrevValue = 5;
+       int intPref = 0;                        
+       int intType = 0;
+       long ListCtrlIndex;
+       
+       SplitValues(&PropertySeg1, &SplitPoints, &SplitLength, intPrevValue);
+       
+       intPrevValue = 4;
+       
+       PropertyType PropType = PROPERTY_NONE;
+               
+       // Look for type before continuing.
+       
+       CheckType(&PropertySeg1, &SplitPoints, &SplitLength, &intPrevValue, &PropType);
+       
+       // Setup the pointers.
+       
+       std::map<int, wxString> *WebsiteList = NULL;
+       std::map<int, wxString> *WebsiteListAltID = NULL;
+       std::map<int, wxString> *WebsiteListPID = NULL;
+       std::map<int, wxString> *WebsiteListType = NULL;
+       std::map<int, wxString> *WebsiteListTokens = NULL;
+       std::map<int, wxString> *WebsiteListMediatype = NULL;
+       std::map<int, int> *WebsiteListPref = NULL;
+       
+       // Setup blank lines for later on.
+       
+       switch(PropType){
+               case PROPERTY_NONE:
+                       WebsiteList = &GeneralWebsiteList;
+                       WebsiteListType = &GeneralWebsiteListType;
+                       WebsiteListAltID = &GeneralWebsiteListAltID;
+                       WebsiteListPID = &GeneralWebsiteListPID;
+                       WebsiteListTokens = &GeneralWebsiteListTokens;
+                       WebsiteListMediatype = &GeneralWebsiteListMediatype;
+                       WebsiteListPref = &GeneralWebsiteListPref;      
+                       break;
+               case PROPERTY_HOME:
+                       WebsiteList = &HomeWebsiteList;
+                       WebsiteListType = &HomeWebsiteListType;
+                       WebsiteListAltID = &HomeWebsiteListAltID;
+                       WebsiteListPID = &HomeWebsiteListPID;
+                       WebsiteListTokens = &HomeWebsiteListTokens;
+                       WebsiteListMediatype = &HomeWebsiteListMediatype;
+                       WebsiteListPref = &HomeWebsiteListPref; 
+                       break;
+               case PROPERTY_WORK:
+                       WebsiteList = &BusinessWebsiteList;
+                       WebsiteListType = &BusinessWebsiteListType;
+                       WebsiteListAltID = &BusinessWebsiteListAltID;
+                       WebsiteListPID = &BusinessWebsiteListPID;
+                       WebsiteListTokens = &BusinessWebsiteListTokens;
+                       WebsiteListMediatype = &BusinessWebsiteListMediatype;   
+                       WebsiteListPref = &BusinessWebsiteListPref;
+                       break;
+       }
+       
+       intPrevValue = 4;
+       bool PropertyMatched = FALSE;
+       
+       for (std::map<int, int>::iterator intiter = SplitPoints.begin(); 
+       intiter != SplitPoints.end(); ++intiter){
+       
+               SLiter = SplitLength.find(intiter->first);
+       
+               PropertyData = PropertySeg1.Mid(intPrevValue, (SLiter->second));
+               
+               wxStringTokenizer PropertyElement (PropertyData, wxT("="));
+               PropertyName = PropertyElement.GetNextToken();                          
+               PropertyValue = PropertyElement.GetNextToken();
+               
+               intPrevValue = intiter->second;
+               
+               // Process properties.
+               
+               size_t intPropertyValueLen = PropertyValue.Len();
+               
+               if (PropertyValue.Mid((intPropertyValueLen - 1), 1) == wxT("\"")){
+                       
+                       PropertyValue.Trim();
+                       PropertyValue.RemoveLast();
+                       
+               }                               
+               
+               if (PropertyValue.Mid(0, 1) == wxT("\"")){
+                       
+                       PropertyValue.Remove(0, 1);
+                       
+               }
+               
+               CaptureString(&PropertyValue, FALSE);
+               
+               ProcessStringValue(&PropertyName, "ALTID", WebsiteListAltID, &PropertyValue, URLCount, &PropertyMatched);
+               ProcessStringValue(&PropertyName, "PID", WebsiteListPID, &PropertyValue, URLCount, &PropertyMatched);
+               ProcessStringValue(&PropertyName, "MEDIATYPE", WebsiteListMediatype, &PropertyValue, URLCount, &PropertyMatched);
+               ProcessIntegerValue(&PropertyName, "PREF", WebsiteListPref, &PropertyValue, URLCount, &PropertyMatched);
+               
+               if (PropertyMatched == TRUE){
+               
+                       PropertyMatched = FALSE;
+                       continue;
+               
+               }
+               
+               if (!PropertyName.IsEmpty() && !PropertyValue.IsEmpty() && PropertyName != wxT("TYPE")){
+       
+                       if (FirstToken == TRUE){
+               
+                               PropertyTokens.Append(PropertyName + wxT("=") + PropertyValue);
+                               FirstToken = FALSE;
+               
+                       } else {
+               
+                               PropertyTokens.Append(wxT(";") + PropertyName + wxT("=") + PropertyValue);
+               
+                       }
+       
+               }
+       
+       }
+       
+       // Add the data to the General/Home/Work address variables.
+       
+       CaptureString(&PropertySeg2, FALSE);
+                       
+       WebsiteList->insert(std::make_pair(*URLCount, PropertySeg2));
+       
+       if (!PropertyTokens.IsEmpty()){
+       
+               WebsiteListTokens->insert(std::make_pair(*URLCount, PropertyTokens));
+                       
+       }
+       
+}
+
+void ContactDataObject::ProcessTitle(wxString PropertySeg1, wxString PropertySeg2, int *TitleCount){
+
+       std::map<int, int> SplitPoints;
+       std::map<int, int> SplitLength;
+       std::map<int, int>::iterator SLiter;                    
+       wxString PropertyData;
+       wxString PropertyName;
+       wxString PropertyValue;
+       wxString PropertyTokens;
+       bool FirstToken = TRUE;
+       int intPrevValue = 7;
+       int intPref = 0;                        
+       int intType = 0;
+       long ListCtrlIndex;
+       
+       SplitValues(&PropertySeg1, &SplitPoints, &SplitLength, intPrevValue);
+       
+       intPrevValue = 6;
+       
+       PropertyType PropType = PROPERTY_NONE;
+               
+       // Look for type before continuing.
+       
+       CheckType(&PropertySeg1, &SplitPoints, &SplitLength, &intPrevValue, &PropType);
+       
+       // Setup the pointers.
+       
+       std::map<int, wxString> *TitleList = NULL;
+       std::map<int, wxString> *TitleListAltID = NULL;
+       std::map<int, wxString> *TitleListPID = NULL;
+       std::map<int, wxString> *TitleListType = NULL;
+       std::map<int, wxString> *TitleListTokens = NULL;
+       std::map<int, wxString> *TitleListLanguage = NULL;
+       std::map<int, int> *TitleListPref = NULL;
+       
+       // Setup blank lines for later on.
+       
+       switch(PropType){
+               case PROPERTY_NONE:
+                       TitleList = &GeneralTitleList;
+                       TitleListType = &GeneralTitleListType;
+                       TitleListAltID = &GeneralTitleListAltID;
+                       TitleListPID = &GeneralTitleListPID;
+                       TitleListTokens = &GeneralTitleListTokens;
+                       TitleListLanguage = &GeneralTitleListLanguage;
+                       TitleListPref = &GeneralTitleListPref;  
+                       break;
+               case PROPERTY_HOME:
+                       TitleList = &HomeTitleList;
+                       TitleListType = &HomeTitleListType;
+                       TitleListAltID = &HomeTitleListAltID;
+                       TitleListPID = &HomeTitleListPID;
+                       TitleListTokens = &HomeTitleListTokens;
+                       TitleListLanguage = &HomeTitleListLanguage;
+                       TitleListPref = &HomeTitleListPref;     
+                       break;
+               case PROPERTY_WORK:
+                       TitleList = &BusinessTitleList;
+                       TitleListType = &BusinessTitleListType;
+                       TitleListAltID = &BusinessTitleListAltID;
+                       TitleListPID = &BusinessTitleListPID;
+                       TitleListTokens = &BusinessTitleListTokens;
+                       TitleListLanguage = &BusinessTitleListLanguage; 
+                       TitleListPref = &BusinessTitleListPref;
+                       break;
+       }
+
+       intPrevValue = 6;
+       bool PropertyMatched = FALSE;
+               
+       for (std::map<int, int>::iterator intiter = SplitPoints.begin(); 
+       intiter != SplitPoints.end(); ++intiter){
+       
+               SLiter = SplitLength.find(intiter->first);
+       
+               PropertyData = PropertySeg1.Mid(intPrevValue, (SLiter->second));
+               
+               wxStringTokenizer PropertyElement (PropertyData, wxT("="));
+               PropertyName = PropertyElement.GetNextToken();                          
+               PropertyValue = PropertyElement.GetNextToken();
+               
+               intPrevValue = intiter->second;
+               
+               // Process properties.
+               
+               size_t intPropertyValueLen = PropertyValue.Len();
+               
+               if (PropertyValue.Mid((intPropertyValueLen - 1), 1) == wxT("\"")){
+                       
+                       PropertyValue.Trim();
+                       PropertyValue.RemoveLast();
+                       
+               }                               
+               
+               if (PropertyValue.Mid(0, 1) == wxT("\"")){
+                       
+                       PropertyValue.Remove(0, 1);
+                       
+               }                               
+               
+               CaptureString(&PropertyValue, FALSE);
+               
+               ProcessStringValue(&PropertyName, "ALTID", TitleListAltID, &PropertyValue, TitleCount, &PropertyMatched);
+               ProcessStringValue(&PropertyName, "PID", TitleListPID, &PropertyValue, TitleCount, &PropertyMatched);
+               ProcessStringValue(&PropertyName, "LANGUAGE", TitleListLanguage, &PropertyValue, TitleCount, &PropertyMatched);
+               ProcessIntegerValue(&PropertyName, "PREF", TitleListPref, &PropertyValue, TitleCount, &PropertyMatched);
+               
+               if (PropertyMatched == TRUE){
+               
+                       PropertyMatched = FALSE;
+                       continue;
+               
+               }
+
+               if (!PropertyName.IsEmpty() && !PropertyValue.IsEmpty() && PropertyName != wxT("TYPE")){
+       
+                       if (FirstToken == TRUE){
+               
+                               PropertyTokens.Append(PropertyName + wxT("=") + PropertyValue);
+                               FirstToken = FALSE;
+               
+                       } else {
+               
+                               PropertyTokens.Append(wxT(";") + PropertyName + wxT("=") + PropertyValue);
+               
+                       }
+       
+               }
+       
+       }
+       
+       // Add the data to the General/Home/Work address variables.
+       
+       CaptureString(&PropertySeg2, FALSE);
+
+       TitleList->insert(std::make_pair(*TitleCount, PropertySeg2));
+       
+       if (!PropertyTokens.IsEmpty()){
+       
+               TitleListTokens->insert(std::make_pair(*TitleCount, PropertyTokens));
+                       
+       }
+
+}
+
+void ContactDataObject::ProcessRole(wxString PropertySeg1, wxString PropertySeg2, int *RoleCount){
+
+       std::map<int, int> SplitPoints;
+       std::map<int, int> SplitLength;
+       std::map<int, int>::iterator SLiter;                    
+       wxString PropertyData;
+       wxString PropertyName;
+       wxString PropertyValue;
+       wxString PropertyTokens;
+       bool FirstToken = TRUE;
+       int intPrevValue = 6;
+       int intPref = 0;                        
+       int intType = 0;
+       long ListCtrlIndex;
+       
+       SplitValues(&PropertySeg1, &SplitPoints, &SplitLength, intPrevValue);
+       
+       intPrevValue = 5;
+       
+       PropertyType PropType = PROPERTY_NONE;
+               
+       // Look for type before continuing.
+       
+       CheckType(&PropertySeg1, &SplitPoints, &SplitLength, &intPrevValue, &PropType);
+       
+       // Setup the pointers.
+       
+       std::map<int, wxString> *RoleList = NULL;
+       std::map<int, wxString> *RoleListAltID = NULL;
+       std::map<int, wxString> *RoleListPID = NULL;
+       std::map<int, wxString> *RoleListType = NULL;
+       std::map<int, wxString> *RoleListTokens = NULL;
+       std::map<int, wxString> *RoleListLanguage = NULL;
+       std::map<int, int> *RoleListPref = NULL;
+       
+       // Setup blank lines for later on.
+       
+       switch(PropType){
+               case PROPERTY_NONE:
+                       RoleList = &GeneralRoleList;
+                       RoleListType = &GeneralRoleListType;
+                       RoleListAltID = &GeneralRoleListAltID;
+                       RoleListPID = &GeneralRoleListPID;
+                       RoleListTokens = &GeneralRoleListTokens;
+                       RoleListLanguage = &GeneralRoleListLanguage;
+                       RoleListPref = &GeneralRoleListPref;    
+                       break;
+               case PROPERTY_HOME:
+                       RoleList = &HomeRoleList;
+                       RoleListType = &HomeRoleListType;
+                       RoleListAltID = &HomeRoleListAltID;
+                       RoleListPID = &HomeRoleListPID;
+                       RoleListTokens = &HomeRoleListTokens;
+                       RoleListLanguage = &HomeRoleListLanguage;
+                       RoleListPref = &HomeRoleListPref;       
+                       break;
+               case PROPERTY_WORK:
+                       RoleList = &BusinessRoleList;
+                       RoleListType = &BusinessRoleListType;
+                       RoleListAltID = &BusinessRoleListAltID;
+                       RoleListPID = &BusinessRoleListPID;
+                       RoleListTokens = &BusinessRoleListTokens;
+                       RoleListLanguage = &BusinessRoleListLanguage;   
+                       RoleListPref = &BusinessRoleListPref;
+                       break;
+       }
+
+       intPrevValue = 5;
+       bool PropertyMatched = FALSE;
+               
+       for (std::map<int, int>::iterator intiter = SplitPoints.begin(); 
+       intiter != SplitPoints.end(); ++intiter){
+       
+               SLiter = SplitLength.find(intiter->first);
+       
+               PropertyData = PropertySeg1.Mid(intPrevValue, (SLiter->second));
+               
+               wxStringTokenizer PropertyElement (PropertyData, wxT("="));
+               PropertyName = PropertyElement.GetNextToken();                          
+               PropertyValue = PropertyElement.GetNextToken();
+               
+               intPrevValue = intiter->second;
+               
+               // Process properties.
+               
+               size_t intPropertyValueLen = PropertyValue.Len();
+               
+               if (PropertyValue.Mid((intPropertyValueLen - 1), 1) == wxT("\"")){
+                       
+                       PropertyValue.Trim();
+                       PropertyValue.RemoveLast();
+                       
+               }                               
+               
+               if (PropertyValue.Mid(0, 1) == wxT("\"")){
+                       
+                       PropertyValue.Remove(0, 1);
+                       
+               }                               
+               
+               CaptureString(&PropertyValue, FALSE);
+               
+               ProcessStringValue(&PropertyName, "ALTID", RoleListAltID, &PropertyValue, RoleCount, &PropertyMatched);
+               ProcessStringValue(&PropertyName, "PID", RoleListPID, &PropertyValue, RoleCount, &PropertyMatched);
+               ProcessStringValue(&PropertyName, "LANGUAGE", RoleListLanguage, &PropertyValue, RoleCount, &PropertyMatched);
+               ProcessIntegerValue(&PropertyName, "PREF", RoleListPref, &PropertyValue, RoleCount, &PropertyMatched);
+               
+               if (PropertyMatched == TRUE){
+               
+                       PropertyMatched = FALSE;
+                       continue;
+               
+               }
+               
+               if (!PropertyName.IsEmpty() && !PropertyValue.IsEmpty() && PropertyName != wxT("TYPE")){
+       
+                       if (FirstToken == TRUE){
+               
+                               PropertyTokens.Append(PropertyName + wxT("=") + PropertyValue);
+                               FirstToken = FALSE;
+               
+                       } else {
+               
+                               PropertyTokens.Append(wxT(";") + PropertyName + wxT("=") + PropertyValue);
+               
+                       }
+       
+               }
+               
+       }
+       
+       // Add the data to the General/Home/Work address variables.
+       
+       CaptureString(&PropertySeg2, FALSE);
+
+       RoleList->insert(std::make_pair(*RoleCount, PropertySeg2));
+       
+       if (!PropertyTokens.IsEmpty()){
+       
+               RoleListTokens->insert(std::make_pair(*RoleCount, PropertyTokens));
+                       
+       }
+
+}
+
+void ContactDataObject::ProcessOrganisation(wxString PropertySeg1, wxString PropertySeg2, int *OrganisationCount){
+
+       std::map<int, int> SplitPoints;
+       std::map<int, int> SplitLength;
+       std::map<int, int>::iterator SLiter;                    
+       wxString PropertyData;
+       wxString PropertyName;
+       wxString PropertyValue;
+       wxString PropertyTokens;
+       bool FirstToken = TRUE;
+       int intPrevValue = 5;
+       int intPref = 0;                        
+       int intType = 0;
+       long ListCtrlIndex;
+       
+       SplitValues(&PropertySeg1, &SplitPoints, &SplitLength, intPrevValue);
+       
+       intPrevValue = 4;
+       
+       PropertyType PropType = PROPERTY_NONE;
+               
+       // Look for type before continuing.
+       
+       CheckType(&PropertySeg1, &SplitPoints, &SplitLength, &intPrevValue, &PropType);
+       
+       // Setup the pointers.
+       
+       std::map<int, wxString> *OrganisationsList = NULL;
+       std::map<int, wxString> *OrganisationsListAltID = NULL;
+       std::map<int, wxString> *OrganisationsListPID = NULL;
+       std::map<int, wxString> *OrganisationsListType = NULL;
+       std::map<int, wxString> *OrganisationsListTokens = NULL;
+       std::map<int, wxString> *OrganisationsListLanguage = NULL;
+       std::map<int, wxString> *OrganisationsListSortAs = NULL;
+       std::map<int, int> *OrganisationsListPref = NULL;
+       
+       // Setup blank lines for later on.
+       
+       switch(PropType){
+               case PROPERTY_NONE:
+                       OrganisationsList = &GeneralOrganisationsList;
+                       OrganisationsListType = &GeneralOrganisationsListType;
+                       OrganisationsListAltID = &GeneralOrganisationsListAltID;
+                       OrganisationsListPID = &GeneralOrganisationsListPID;
+                       OrganisationsListTokens = &GeneralOrganisationsListTokens;
+                       OrganisationsListLanguage = &GeneralOrganisationsListLanguage;
+                       OrganisationsListSortAs = &GeneralOrganisationsListSortAs;
+                       OrganisationsListPref = &GeneralOrganisationsListPref;  
+                       break;
+               case PROPERTY_HOME:
+                       OrganisationsList = &HomeOrganisationsList;
+                       OrganisationsListType = &HomeOrganisationsListType;
+                       OrganisationsListAltID = &HomeOrganisationsListAltID;
+                       OrganisationsListPID = &HomeOrganisationsListPID;
+                       OrganisationsListTokens = &HomeOrganisationsListTokens;
+                       OrganisationsListLanguage = &HomeOrganisationsListLanguage;
+                       OrganisationsListSortAs = &HomeOrganisationsListSortAs;
+                       OrganisationsListPref = &HomeOrganisationsListPref;     
+                       break;
+               case PROPERTY_WORK:
+                       OrganisationsList = &BusinessOrganisationsList;
+                       OrganisationsListType = &BusinessOrganisationsListType;
+                       OrganisationsListAltID = &BusinessOrganisationsListAltID;
+                       OrganisationsListPID = &BusinessOrganisationsListPID;
+                       OrganisationsListTokens = &BusinessOrganisationsListTokens;
+                       OrganisationsListLanguage = &BusinessOrganisationsListLanguage;
+                       OrganisationsListSortAs = &BusinessOrganisationsListSortAs;     
+                       OrganisationsListPref = &BusinessOrganisationsListPref;
+                       break;
+       }
+
+       intPrevValue = 4;
+               
+       for (std::map<int, int>::iterator intiter = SplitPoints.begin(); 
+       intiter != SplitPoints.end(); ++intiter){
+       
+               SLiter = SplitLength.find(intiter->first);
+       
+               PropertyData = PropertySeg1.Mid(intPrevValue, (SLiter->second));
+               
+               wxStringTokenizer PropertyElement (PropertyData, wxT("="));
+               PropertyName = PropertyElement.GetNextToken();                          
+               PropertyValue = PropertyElement.GetNextToken();
+               
+               intPrevValue = intiter->second;
+               
+               // Process properties.
+               
+               size_t intPropertyValueLen = PropertyValue.Len();
+               
+               if (PropertyValue.Mid((intPropertyValueLen - 1), 1) == wxT("\"")){
+                       
+                       PropertyValue.Trim();
+                       PropertyValue.RemoveLast();
+                       
+               }                               
+               
+               if (PropertyValue.Mid(0, 1) == wxT("\"")){
+                       
+                       PropertyValue.Remove(0, 1);
+                       
+               }                               
+               
+               CaptureString(&PropertyValue, FALSE);
+               
+               if (PropertyName == wxT("ALTID")){
+               
+                       OrganisationsListAltID->erase(*OrganisationCount);
+                       OrganisationsListAltID->insert(std::make_pair(*OrganisationCount, PropertyValue));
+               
+               } else if (PropertyName == wxT("PID")){
+
+                       OrganisationsListPID->erase(*OrganisationCount);
+                       OrganisationsListPID->insert(std::make_pair(*OrganisationCount, PropertyValue));
+               
+               } else if (PropertyName == wxT("SORT-AS")){
+
+                       OrganisationsListSortAs->erase(*OrganisationCount);
+                       OrganisationsListSortAs->insert(std::make_pair(*OrganisationCount, PropertyValue));
+               
+               } else if (PropertyName == wxT("PREF")){
+
+                       ProcessIntegerValue(OrganisationsListPref, &PropertyValue, OrganisationCount);
+                       
+               } else if (PropertyName == wxT("LANGUAGE")){
+               
+                       OrganisationsListLanguage->erase(*OrganisationCount);
+                       OrganisationsListLanguage->insert(std::make_pair(*OrganisationCount, PropertyValue));
+               
+               } else {
+               
+                       // Something else we don't know about so append
+                       // to the tokens variable.
+               
+                       if (!PropertyName.IsEmpty() && !PropertyValue.IsEmpty() && PropertyName != wxT("TYPE")){
+               
+                               if (FirstToken == TRUE){
+                       
+                                       PropertyTokens.Append(PropertyName + wxT("=") + PropertyValue);
+                                       FirstToken = FALSE;
+                       
+                               } else {
+                       
+                                       PropertyTokens.Append(wxT(";") + PropertyName + wxT("=") + PropertyValue);
+                       
+                               }
+               
+                       }
+               
+               }
+       
+       }
+       
+       // Add the data to the General/Home/Work address variables.
+       
+       CaptureString(&PropertySeg2, FALSE);
+
+       OrganisationsList->insert(std::make_pair(*OrganisationCount, PropertySeg2));
+       
+       if (!PropertyTokens.IsEmpty()){
+       
+               OrganisationsListTokens->insert(std::make_pair(*OrganisationCount, PropertyTokens));
+                       
+       }
+
+}
+
+void ContactDataObject::ProcessNote(wxString PropertySeg1, wxString PropertySeg2, int *NoteCount){
+
+       std::map<int, int> SplitPoints;
+       std::map<int, int> SplitLength;
+       std::map<int, int>::iterator SLiter;                    
+       wxString PropertyData;
+       wxString PropertyName;
+       wxString PropertyValue;
+       wxString PropertyTokens;
+       bool FirstToken = TRUE;
+       int intPrevValue = 6;
+       int intPref = 0;                        
+       int intType = 0;
+       long ListCtrlIndex;
+       
+       SplitValues(&PropertySeg1, &SplitPoints, &SplitLength, intPrevValue);
+       
+       intPrevValue = 5;
+       
+       PropertyType PropType = PROPERTY_NONE;
+               
+       // Look for type before continuing.
+       
+       CheckType(&PropertySeg1, &SplitPoints, &SplitLength, &intPrevValue, &PropType);
+       
+       // Setup the pointers.
+       
+       std::map<int, wxString> *NoteList = NULL;
+       std::map<int, wxString> *NoteListAltID = NULL;
+       std::map<int, wxString> *NoteListPID = NULL;
+       std::map<int, wxString> *NoteListType = NULL;
+       std::map<int, wxString> *NoteListTokens = NULL;
+       std::map<int, wxString> *NoteListLanguage = NULL;
+       std::map<int, int> *NoteListPref = NULL;
+       
+       // Setup blank lines for later on.
+       
+       switch(PropType){
+               case PROPERTY_NONE:
+                       NoteList = &GeneralNoteList;
+                       NoteListType = &GeneralNoteListType;
+                       NoteListAltID = &GeneralNoteListAltID;
+                       NoteListPID = &GeneralNoteListPID;
+                       NoteListTokens = &GeneralNoteListTokens;
+                       NoteListLanguage = &GeneralNoteListLanguage;
+                       NoteListPref = &GeneralNoteListPref;    
+                       break;
+               case PROPERTY_HOME:
+                       NoteList = &HomeNoteList;
+                       NoteListType = &HomeNoteListType;
+                       NoteListAltID = &HomeNoteListAltID;
+                       NoteListPID = &HomeNoteListPID;
+                       NoteListTokens = &HomeNoteListTokens;
+                       NoteListLanguage = &HomeNoteListLanguage;
+                       NoteListPref = &HomeNoteListPref;       
+                       break;
+               case PROPERTY_WORK:
+                       NoteList = &BusinessNoteList;
+                       NoteListType = &BusinessNoteListType;
+                       NoteListAltID = &BusinessNoteListAltID;
+                       NoteListPID = &BusinessNoteListPID;
+                       NoteListTokens = &BusinessNoteListTokens;
+                       NoteListLanguage = &BusinessNoteListLanguage;   
+                       NoteListPref = &BusinessNoteListPref;
+                       break;
+       }
+
+       intPrevValue = 5;
+               
+       for (std::map<int, int>::iterator intiter = SplitPoints.begin(); 
+       intiter != SplitPoints.end(); ++intiter){
+       
+               SLiter = SplitLength.find(intiter->first);
+       
+               PropertyData = PropertySeg1.Mid(intPrevValue, (SLiter->second));
+               
+               wxStringTokenizer PropertyElement (PropertyData, wxT("="));
+               PropertyName = PropertyElement.GetNextToken();                          
+               PropertyValue = PropertyElement.GetNextToken();
+               
+               intPrevValue = intiter->second;
+               
+               // Process properties.
+               
+               size_t intPropertyValueLen = PropertyValue.Len();
+               
+               if (PropertyValue.Mid((intPropertyValueLen - 1), 1) == wxT("\"")){
+                       
+                       PropertyValue.Trim();
+                       PropertyValue.RemoveLast();
+                       
+               }                               
+               
+               if (PropertyValue.Mid(0, 1) == wxT("\"")){
+                       
+                       PropertyValue.Remove(0, 1);
+                       
+               }                               
+               
+               CaptureString(&PropertyValue, FALSE);
+               
+               if (PropertyName == wxT("ALTID")){
+               
+                       NoteListAltID->erase(*NoteCount);
+                       NoteListAltID->insert(std::make_pair(*NoteCount, PropertyValue));
+               
+               } else if (PropertyName == wxT("PID")){
+
+                       NoteListPID->erase(*NoteCount);
+                       NoteListPID->insert(std::make_pair(*NoteCount, PropertyValue));
+               
+               } else if (PropertyName == wxT("PREF")){
+
+                       ProcessIntegerValue(NoteListPref, &PropertyValue, NoteCount);
+               
+               } else if (PropertyName == wxT("LANGUAGE")){
+               
+                       NoteListLanguage->erase(*NoteCount);
+                       NoteListLanguage->insert(std::make_pair(*NoteCount, PropertyValue));
+               
+               } else {
+               
+                       // Something else we don't know about so append
+                       // to the tokens variable.
+               
+                       if (!PropertyName.IsEmpty() && !PropertyValue.IsEmpty() && PropertyName != wxT("TYPE")){
+               
+                               if (FirstToken == TRUE){
+                       
+                                       PropertyTokens.Append(PropertyName + wxT("=") + PropertyValue);
+                                       FirstToken = FALSE;
+                       
+                               } else {
+                       
+                                       PropertyTokens.Append(wxT(";") + PropertyName + wxT("=") + PropertyValue);
+                       
+                               }
+               
+                       }
+               
+               }
+       
+       }
+       
+       // Add the data to the General/Home/Work address variables.
+       
+       CaptureString(&PropertySeg2, FALSE);
+
+       NoteList->insert(std::make_pair(*NoteCount, PropertySeg2));
+       
+       if (!PropertyTokens.IsEmpty()){
+       
+               NoteListTokens->insert(std::make_pair(*NoteCount, PropertyTokens));
+                       
+       }
+
+}
+
+void ContactDataObject::ProcessCategory(wxString PropertySeg1, wxString PropertySeg2, int *CategoryCount){
+
+       std::map<int, int> SplitPoints;
+       std::map<int, int> SplitLength;
+       std::map<int, int>::iterator SLiter;                    
+       wxString PropertyData;
+       wxString PropertyName;
+       wxString PropertyValue;
+       wxString PropertyTokens;
+       bool FirstToken = TRUE;
+       int intPrevValue = 12;
+       int intPref = 0;                        
+       int intType = 0;
+       long ListCtrlIndex;
+       
+       SplitValues(&PropertySeg1, &SplitPoints, &SplitLength, intPrevValue);
+       
+       intPrevValue = 11;
+       
+       PropertyType PropType = PROPERTY_NONE;
+               
+       // Look for type before continuing.
+       
+       CheckType(&PropertySeg1, &SplitPoints, &SplitLength, &intPrevValue, &PropType);
+       
+       // Setup blank lines for later on.
+       
+       switch(PropType){
+               case PROPERTY_NONE:
+                       break;
+               case PROPERTY_HOME:
+                       CategoriesListType.insert(std::make_pair(*CategoryCount, "home"));
+                       break;
+               case PROPERTY_WORK:
+                       CategoriesListType.insert(std::make_pair(*CategoryCount, "work"));
+                       break;
+       }
+
+       intPrevValue = 11;
+               
+       for (std::map<int, int>::iterator intiter = SplitPoints.begin(); 
+       intiter != SplitPoints.end(); ++intiter){
+       
+               SLiter = SplitLength.find(intiter->first);
+       
+               PropertyData = PropertySeg1.Mid(intPrevValue, (SLiter->second));
+               
+               wxStringTokenizer PropertyElement (PropertyData, wxT("="));
+               PropertyName = PropertyElement.GetNextToken();                          
+               PropertyValue = PropertyElement.GetNextToken();
+               
+               intPrevValue = intiter->second;
+               
+               // Process properties.
+               
+               size_t intPropertyValueLen = PropertyValue.Len();
+               
+               if (PropertyValue.Mid((intPropertyValueLen - 1), 1) == wxT("\"")){
+                       
+                       PropertyValue.Trim();
+                       PropertyValue.RemoveLast();
+                       
+               }                               
+               
+               if (PropertyValue.Mid(0, 1) == wxT("\"")){
+                       
+                       PropertyValue.Remove(0, 1);
+                       
+               }                               
+               
+               CaptureString(&PropertyValue, FALSE);
+               
+               if (PropertyName == wxT("ALTID")){
+               
+                       CategoriesListAltID.erase(*CategoryCount);
+                       CategoriesListAltID.insert(std::make_pair(*CategoryCount, PropertyValue));
+               
+               } else if (PropertyName == wxT("PID")){
+
+                       CategoriesListPID.erase(*CategoryCount);
+                       CategoriesListPID.insert(std::make_pair(*CategoryCount, PropertyValue));
+               
+               } else if (PropertyName == wxT("PREF")){
+
+                       ProcessIntegerValue(&CategoriesListPref, &PropertyValue, CategoryCount);
+                       
+               } else if (PropertyName == wxT("LANGUAGE")){
+               
+                       CategoriesListLanguage.erase(*CategoryCount);
+                       CategoriesListLanguage.insert(std::make_pair(*CategoryCount, PropertyValue));
+               
+               } else {
+               
+                       // Something else we don't know about so append
+                       // to the tokens variable.
+               
+                       if (!PropertyName.IsEmpty() && !PropertyValue.IsEmpty() && PropertyName != wxT("TYPE")){
+               
+                               if (FirstToken == TRUE){
+                       
+                                       PropertyTokens.Append(PropertyName + wxT("=") + PropertyValue);
+                                       FirstToken = FALSE;
+                       
+                               } else {
+                       
+                                       PropertyTokens.Append(wxT(";") + PropertyName + wxT("=") + PropertyValue);
+                       
+                               }
+               
+                       }
+               
+               }
+       
+       }
+       
+       // Deal with multiple categories.
+       
+       int intOrigCatCount = *CategoryCount;
+       bool FirstCategoryProcessed = TRUE;
+       bool AfterFirstToken = FALSE;
+       int intSplitSize = 0;
+       int intSplitsFound = 0;
+       int intSplitSeek = 0;
+       int intPropertyLen = PropertySeg2.Len();
+       
+       SplitPoints.clear();
+       SplitLength.clear();
+       intPrevValue = 0;
+       
+       for (int i = 0; i <= intPropertyLen; i++){
+       
+               if (intSplitSize == 0 && PropertySeg2.Mid(i, 1) == wxT(" ")){
+       
+                       continue;
+               
+               }
+       
+               intSplitSize++;
+       
+               if (PropertySeg2.Mid(i, 1) == wxT(",") && PropertySeg2.Mid((i - 1), 1) != wxT("\\")){
+       
+                       if (AfterFirstToken == TRUE){
+               
+                               SplitPoints.insert(std::make_pair(intSplitsFound, (i - intSplitSize + 1)));
+                               SplitLength.insert(std::make_pair(intSplitsFound, (intSplitSize - 2)));
+                       
+                       } else {
+                       
+                               SplitPoints.insert(std::make_pair(intSplitsFound, 0));
+                               SplitLength.insert(std::make_pair(intSplitsFound, (intSplitSize - 2)));                                 
+                               AfterFirstToken = TRUE;
+
+                       }
+
+                       intSplitsFound++;
+                       intSplitSeek = i;
+                       intSplitSize = 0;                               
+       
+               }                       
+       
+       }
+       
+       if (SplitPoints.size() > 0){
+       
+               SplitPoints.insert(std::make_pair(intSplitsFound, (intSplitSeek + 1)));
+               SplitLength.insert(std::make_pair(intSplitsFound, intSplitSize));
+       
+       }
+       
+       if (SplitPoints.size() == 0){
+       
+               CategoriesList.insert(std::make_pair(*CategoryCount, PropertySeg2));
+       
+               if (!PropertyTokens.IsEmpty()){
+               
+                       CategoriesListTokens.insert(std::make_pair(*CategoryCount, PropertyTokens));
+               
+               }
+       
+       }
+       
+       for (std::map<int, int>::iterator intiter = SplitPoints.begin(); 
+       intiter != SplitPoints.end(); ++intiter){
+       
+               SLiter = SplitLength.find(intiter->first);
+       
+               intPrevValue = intiter->second;
+       
+               PropertyData = PropertySeg2.Mid(intPrevValue, (SLiter->second + 1));
+               
+               // Add the data to the General/Home/Work address variables.
+       
+               // Trim any whitespace from the start and end.
+       
+               PropertyData = PropertyData.Trim(FALSE);
+               PropertyData = PropertyData.Trim(TRUE); 
+       
+               CaptureString(&PropertyData, FALSE);
+               
+               if (FirstCategoryProcessed == TRUE){
+               
+                       FirstCategoryProcessed = FALSE;
+                       
+                       CategoriesList.insert(std::make_pair(*CategoryCount, PropertyData));
+       
+                       if (!PropertyTokens.IsEmpty()){
+               
+                               CategoriesListTokens.insert(std::make_pair(*CategoryCount, PropertyTokens));
+               
+                       }
+                       
+                       continue;
+               
+               } else {
+
+                       (*CategoryCount)++;
+                       
+                       CategoriesList.insert(std::make_pair(*CategoryCount, PropertyData));
+               
+                       if (!PropertyTokens.IsEmpty()){
+               
+                               CategoriesListTokens.insert(std::make_pair(*CategoryCount, PropertyTokens));
+               
+                       }
+               
+               }
+               
+               // Copy the properties to each of the categories (if it exists).
+               
+               if (!PropertyTokens.IsEmpty()){
+               
+                       CategoriesListTokens.insert(std::make_pair(*CategoryCount, CategoriesListTokens.find(intOrigCatCount)->second));
+               
+               }
+               
+               // Check if ALTID was used.
+               
+               if (CategoriesListAltID.find(intOrigCatCount) != CategoriesListAltID.end()){
+               
+                       CategoriesListAltID.insert(std::make_pair(*CategoryCount, CategoriesListAltID.find(intOrigCatCount)->second));
+               
+               }
+               
+               // Check if PID was used.
+               
+               if (CategoriesListPID.find(intOrigCatCount) != CategoriesListPID.end()){
+               
+                       CategoriesListPID.insert(std::make_pair(*CategoryCount, CategoriesListPID.find(intOrigCatCount)->second));
+               
+               }
+       
+               // Check if PREF was used.
+       
+               if (CategoriesListPref.find(intOrigCatCount) != CategoriesListPref.end()){
+               
+                       CategoriesListPref.insert(std::make_pair(*CategoryCount, CategoriesListPref.find(intOrigCatCount)->second));
+               
+               }
+               
+               // Check if LANGUAGE was used.
+               
+               if (CategoriesListLanguage.find(intOrigCatCount) != CategoriesListLanguage.end()){
+               
+                       CategoriesListLanguage.insert(std::make_pair(*CategoryCount, CategoriesListLanguage.find(intOrigCatCount)->second));
+               
+               }
+               
+               // Check if TYPE was used.
+               
+               switch(PropType){
+                       case PROPERTY_NONE:
+                               break;
+                       case PROPERTY_HOME:
+                               CategoriesListType.insert(std::make_pair(*CategoryCount, "home"));
+                               break;
+                       case PROPERTY_WORK:
+                               CategoriesListType.insert(std::make_pair(*CategoryCount, "work"));
+                               break;
+               }
+       
+       }
+
+}
+
+void ContactDataObject::ProcessPhoto(wxString PropertySeg1, wxString PropertySeg2, int *PhotoCount){
+
+       size_t intPropertyLen = PropertySeg1.Len();
+       std::map<int, int> SplitPoints;
+       std::map<int, int> SplitLength;
+       std::map<int, int>::iterator SLiter;                    
+       wxString PropertyData;
+       wxString PropertyName;
+       wxString PropertyValue;
+       wxString PropertyTokens;
+       bool FirstToken = TRUE;
+       int intSplitsFound = 0;
+       int intSplitSize = 0;
+       int intPrevValue = 7;
+       int intPref = 0;                        
+       int intType = 0;
+       
+       SplitValues(&PropertySeg1, &SplitPoints, &SplitLength, intPrevValue);
+       
+       intPrevValue = 6;
+       
+       PropertyType PropType = PROPERTY_NONE;
+               
+       // Look for type before continuing.
+       
+       CheckType(&PropertySeg1, &SplitPoints, &SplitLength, &intPrevValue, &PropType);
+
+       intPrevValue = 6;
+
+       for (std::map<int, int>::iterator intiter = SplitPoints.begin(); 
+       intiter != SplitPoints.end(); ++intiter){
+       
+               SLiter = SplitLength.find(intiter->first);
+       
+               PropertyData = PropertySeg1.Mid(intPrevValue, (SLiter->second));
+               
+               wxStringTokenizer PropertyElement (PropertyData, wxT("="));
+               PropertyName = PropertyElement.GetNextToken();                          
+               PropertyValue = PropertyElement.GetNextToken();
+               
+               intPrevValue = intiter->second;
+               
+               // Process properties.
+               
+               size_t intPropertyValueLen = PropertyValue.Len();
+               
+               if (PropertyValue.Mid((intPropertyValueLen - 1), 1) == wxT("\"")){
+                       
+                       PropertyValue.Trim();
+                       PropertyValue.RemoveLast();
+                       
+               }                               
+               
+               if (PropertyValue.Mid(0, 1) == wxT("\"")){
+                       
+                       PropertyValue.Remove(0, 1);
+                       
+               }
+               
+               CaptureString(&PropertyValue, FALSE);
+               
+               if (PropertyName == wxT("ALTID")){
+
+                       PicturesListAltID.erase(*PhotoCount);
+                       PicturesListAltID.insert(std::make_pair(*PhotoCount, PropertyValue));
+               
+               } else if (PropertyName == wxT("PID")){
+
+                       PicturesListPID.erase(*PhotoCount);
+                       PicturesListPID.insert(std::make_pair(*PhotoCount, PropertyValue));
+               
+               } else if (PropertyName == wxT("PREF")){
+
+                       ProcessIntegerValue(&PicturesListPref, &PropertyValue, PhotoCount);
+               
+               } else if (PropertyName == wxT("MEDIATYPE")){
+               
+                       PicturesListMediatype.erase(*PhotoCount);
+                       PicturesListMediatype.insert(std::make_pair(*PhotoCount, PropertyValue));
+                                       
+               } else {
+               
+                       // Something else we don't know about so append
+                       // to the tokens variable.
+                       
+                       if (!PropertyName.IsEmpty() && !PropertyValue.IsEmpty() && PropertyName != wxT("TYPE")){
+                       
+                               if (FirstToken == TRUE){
+                               
+                                       PropertyTokens.Append(PropertyName + wxT("=") + PropertyValue);
+                                       FirstToken = FALSE;
+                               
+                               } else {
+                               
+                                       PropertyTokens.Append(wxT(";") + PropertyName + wxT("=") + PropertyValue);
+                               
+                               }
+                       
+                       }
+               
+               }
+       
+       }       
+       
+       intPropertyLen = PropertySeg2.Len();
+       SplitPoints.clear();
+       SplitLength.clear();
+       intSplitsFound = 0;
+       intSplitSize = 0;
+       intPrevValue = 0;                       
+       
+       CaptureString(&PropertySeg2, FALSE);
+       
+       for (int i = 0; i <= intPropertyLen; i++){
+
+               intSplitSize++;
+       
+               if (PropertySeg2.Mid(i, 1) == wxT(";")){
+       
+                       intSplitsFound++;
+                       SplitPoints.insert(std::make_pair(intSplitsFound, (i + 1)));
+                       
+                       if (intSplitsFound == 6){ 
+                       
+                               SplitLength.insert(std::make_pair(intSplitsFound, (intSplitSize - 1)));
+                               break; 
+                               
+                       } else {
+                       
+                               SplitLength.insert(std::make_pair(intSplitsFound, (intSplitSize - 1)));
+                       
+                       }
+                       
+                       intSplitSize = 0;                                       
+       
+               }
+
+       }
+       
+       wxString wxSPhotoURI;
+       wxString wxSPhotoMIME;
+       wxString wxSPhotoEncoding;
+       wxString wxSPhotoData;
+       std::string base64enc;
+       
+       if (intSplitsFound == 0){
+       
+       } else {
+       
+               std::map<int, int>::iterator striter;
+       
+               striter = SplitLength.find(1);
+       
+               wxStringTokenizer wSTDataType(PropertySeg2.Mid(0, striter->second), wxT(":"));
+       
+               while (wSTDataType.HasMoreTokens() == TRUE){
+               
+                       wxSPhotoURI = wSTDataType.GetNextToken();
+                       wxSPhotoMIME = wSTDataType.GetNextToken();
+                       break;
+               
+               }                       
+       
+               wxStringTokenizer wSTDataInfo(PropertySeg2.Mid((striter->second + 1)), wxT(","));                       
+       
+               while (wSTDataInfo.HasMoreTokens() == TRUE){
+               
+                       wxSPhotoEncoding = wSTDataInfo.GetNextToken();
+                       wxSPhotoData = wSTDataInfo.GetNextToken();
+                       base64enc = wxSPhotoData.mb_str();
+                       break;
+               
+               }
+       
+       }
+       
+       // Add the data to the General/Home/Work address variables.
+       
+       PicturesList.insert(std::make_pair(*PhotoCount, base64enc));
+       PicturesListPictureType.insert(std::make_pair(*PhotoCount, wxSPhotoMIME));
+       PicturesListPicEncType.insert(std::make_pair(*PhotoCount, wxSPhotoEncoding));
+       
+       switch(PropType){
+               case PROPERTY_NONE:
+                       break;
+               case PROPERTY_HOME:
+                       PicturesListType.insert(std::make_pair(*PhotoCount, "home"));
+                       break;
+               case PROPERTY_WORK:
+                       PicturesListType.insert(std::make_pair(*PhotoCount, "work"));
+                       break;
+       }
+       
+       if (!PropertyTokens.IsEmpty()){
+
+               PicturesListTokens.insert(std::make_pair(*PhotoCount, PropertyTokens));
+       
+       }
+
+}
+
+void ContactDataObject::ProcessLogo(wxString PropertySeg1, wxString PropertySeg2, int *LogoCount){
+
+       size_t intPropertyLen = PropertySeg1.Len();
+       std::map<int, int> SplitPoints;
+       std::map<int, int> SplitLength;
+       std::map<int, int>::iterator SLiter;                    
+       wxString PropertyData;
+       wxString PropertyName;
+       wxString PropertyValue;
+       wxString PropertyTokens;
+       bool FirstToken = TRUE;
+       int intSplitsFound = 0;
+       int intSplitSize = 0;
+       int intPrevValue = 6;
+       int intPref = 0;                        
+       int intType = 0;
+       
+       SplitValues(&PropertySeg1, &SplitPoints, &SplitLength, intPrevValue);
+       
+       intPrevValue = 5;
+       
+       PropertyType PropType = PROPERTY_NONE;
+               
+       // Look for type before continuing.
+       
+       CheckType(&PropertySeg1, &SplitPoints, &SplitLength, &intPrevValue, &PropType);
+
+       intPrevValue = 5;
+
+       for (std::map<int, int>::iterator intiter = SplitPoints.begin(); 
+       intiter != SplitPoints.end(); ++intiter){
+       
+               SLiter = SplitLength.find(intiter->first);
+       
+               PropertyData = PropertySeg1.Mid(intPrevValue, (SLiter->second));
+               
+               wxStringTokenizer PropertyElement (PropertyData, wxT("="));
+               PropertyName = PropertyElement.GetNextToken();                          
+               PropertyValue = PropertyElement.GetNextToken();
+               
+               intPrevValue = intiter->second;
+               
+               // Process properties.
+               
+               size_t intPropertyValueLen = PropertyValue.Len();
+               
+               if (PropertyValue.Mid((intPropertyValueLen - 1), 1) == wxT("\"")){
+                       
+                       PropertyValue.Trim();
+                       PropertyValue.RemoveLast();
+                       
+               }                               
+               
+               if (PropertyValue.Mid(0, 1) == wxT("\"")){
+                       
+                       PropertyValue.Remove(0, 1);
+                       
+               }
+               
+               CaptureString(&PropertyValue, FALSE);
+               
+               if (PropertyName == wxT("ALTID")){
+
+                       LogosListAltID.erase(*LogoCount);
+                       LogosListAltID.insert(std::make_pair(*LogoCount, PropertyValue));
+               
+               } else if (PropertyName == wxT("PID")){
+
+                       LogosListPID.erase(*LogoCount);
+                       LogosListPID.insert(std::make_pair(*LogoCount, PropertyValue));
+               
+               } else if (PropertyName == wxT("PREF")){
+
+                       ProcessIntegerValue(&LogosListPref, &PropertyValue, LogoCount);
+               
+               } else if (PropertyName == wxT("MEDIATYPE")){
+               
+                       LogosListMediatype.erase(*LogoCount);
+                       LogosListMediatype.insert(std::make_pair(*LogoCount, PropertyValue));
+                                       
+               } else {
+               
+                       // Something else we don't know about so append
+                       // to the tokens variable.
+                       
+                       if (!PropertyName.IsEmpty() && !PropertyValue.IsEmpty() && PropertyName != wxT("TYPE")){
+                       
+                               if (FirstToken == TRUE){
+                               
+                                       PropertyTokens.Append(PropertyName + wxT("=") + PropertyValue);
+                                       FirstToken = FALSE;
+                               
+                               } else {
+                               
+                                       PropertyTokens.Append(wxT(";") + PropertyName + wxT("=") + PropertyValue);
+                               
+                               }
+                       
+                       }
+               
+               }
+       
+       }       
+       
+       intPropertyLen = PropertySeg2.Len();
+       SplitPoints.clear();
+       SplitLength.clear();
+       intSplitsFound = 0;
+       intSplitSize = 0;
+       intPrevValue = 0;                       
+       
+       CaptureString(&PropertySeg2, FALSE);
+       
+       for (int i = 0; i <= intPropertyLen; i++){
+
+               intSplitSize++;
+       
+               if (PropertySeg2.Mid(i, 1) == wxT(";")){
+       
+                       intSplitsFound++;
+                       SplitPoints.insert(std::make_pair(intSplitsFound, (i + 1)));
+                       
+                       if (intSplitsFound == 6){ 
+                       
+                               SplitLength.insert(std::make_pair(intSplitsFound, (intSplitSize - 1)));
+                               break; 
+                               
+                       } else {
+                       
+                               SplitLength.insert(std::make_pair(intSplitsFound, (intSplitSize - 1)));
+                       
+                       }
+                       
+                       intSplitSize = 0;                                       
+       
+               }
+
+       }
+       
+       wxString wxSPhotoURI;
+       wxString wxSPhotoMIME;
+       wxString wxSPhotoEncoding;
+       wxString wxSPhotoData;
+       std::string base64enc;
+       
+       if (intSplitsFound == 0){
+       
+       } else {
+       
+               std::map<int, int>::iterator striter;
+       
+               striter = SplitLength.find(1);
+       
+               wxStringTokenizer wSTDataType(PropertySeg2.Mid(0, striter->second), wxT(":"));
+       
+               while (wSTDataType.HasMoreTokens() == TRUE){
+               
+                       wxSPhotoURI = wSTDataType.GetNextToken();
+                       wxSPhotoMIME = wSTDataType.GetNextToken();
+                       break;
+               
+               }                       
+       
+               wxStringTokenizer wSTDataInfo(PropertySeg2.Mid((striter->second + 1)), wxT(","));                       
+       
+               while (wSTDataInfo.HasMoreTokens() == TRUE){
+               
+                       wxSPhotoEncoding = wSTDataInfo.GetNextToken();
+                       wxSPhotoData = wSTDataInfo.GetNextToken();
+                       base64enc = wxSPhotoData.mb_str();
+                       break;
+               
+               }
+       
+       }
+       
+       // Add the data to the General/Home/Work address variables.
+       
+       LogosList.insert(std::make_pair(*LogoCount, base64enc));
+       LogosListPictureType.insert(std::make_pair(*LogoCount, wxSPhotoMIME));
+       LogosListPicEncType.insert(std::make_pair(*LogoCount, wxSPhotoEncoding));
+       
+       switch(PropType){
+               case PROPERTY_NONE:
+                       break;
+               case PROPERTY_HOME:
+                       LogosListType.insert(std::make_pair(*LogoCount, "home"));
+                       break;
+               case PROPERTY_WORK:
+                       LogosListType.insert(std::make_pair(*LogoCount, "work"));
+                       break;
+       }
+       
+       if (!PropertyTokens.IsEmpty()){
+
+               LogosListTokens.insert(std::make_pair(*LogoCount, PropertyTokens));
+       
+       }
+
+}
+
+void ContactDataObject::ProcessSound(wxString PropertySeg1, wxString PropertySeg2, int *SoundCount){
+
+       size_t intPropertyLen = PropertySeg1.Len();
+       std::map<int, int> SplitPoints;
+       std::map<int, int> SplitLength;
+       std::map<int, int>::iterator SLiter;                    
+       wxString PropertyData;
+       wxString PropertyName;
+       wxString PropertyValue;
+       wxString PropertyTokens;
+       bool FirstToken = TRUE;
+       int intSplitsFound = 0;
+       int intSplitSize = 0;
+       int intPrevValue = 7;
+       int intPref = 0;                        
+       int intType = 0;
+       
+       SplitValues(&PropertySeg1, &SplitPoints, &SplitLength, intPrevValue);
+       
+       intPrevValue = 6;
+       
+       PropertyType PropType = PROPERTY_NONE;
+       
+       // Look for type before continuing.                     
+
+       CheckType(&PropertySeg1, &SplitPoints, &SplitLength, &intPrevValue, &PropType);
+
+       intPrevValue = 6;
+
+       for (std::map<int, int>::iterator intiter = SplitPoints.begin(); 
+       intiter != SplitPoints.end(); ++intiter){
+       
+               SLiter = SplitLength.find(intiter->first);
+       
+               PropertyData = PropertySeg1.Mid(intPrevValue, (SLiter->second));
+               
+               wxStringTokenizer PropertyElement (PropertyData, wxT("="));
+               PropertyName = PropertyElement.GetNextToken();                          
+               PropertyValue = PropertyElement.GetNextToken();
+               
+               intPrevValue = intiter->second;
+               
+               // Process properties.
+               
+               size_t intPropertyValueLen = PropertyValue.Len();
+               
+               if (PropertyValue.Mid((intPropertyValueLen - 1), 1) == wxT("\"")){
+                       
+                       PropertyValue.Trim();
+                       PropertyValue.RemoveLast();
+                       
+               }                               
+               
+               if (PropertyValue.Mid(0, 1) == wxT("\"")){
+                       
+                       PropertyValue.Remove(0, 1);
+                       
+               }                       
+               
+               CaptureString(&PropertyValue, FALSE);
+               
+               if (PropertyName == wxT("ALTID")){
+
+                       SoundsListAltID.erase(*SoundCount);
+                       SoundsListAltID.insert(std::make_pair(*SoundCount, PropertyValue));
+               
+               } else if (PropertyName == wxT("PID")){
+
+                       SoundsListPID.erase(*SoundCount);
+                       SoundsListPID.insert(std::make_pair(*SoundCount, PropertyValue));
+               
+               } else if (PropertyName == wxT("PREF")){
+
+                       ProcessIntegerValue(&SoundsListPref, &PropertyValue, SoundCount);
+               
+               } else if (PropertyName == wxT("MEDIATYPE")){
+               
+                       SoundsListMediatype.erase(*SoundCount);
+                       SoundsListMediatype.insert(std::make_pair(*SoundCount, PropertyValue));
+
+               } else if (PropertyName == wxT("LANGUAGE")){
+               
+                       SoundsListLanguage.erase(*SoundCount);
+                       SoundsListLanguage.insert(std::make_pair(*SoundCount, PropertyValue));
+
+               } else {
+               
+                       // Something else we don't know about so append
+                       // to the tokens variable.
+                       
+                       if (!PropertyName.IsEmpty() && !PropertyValue.IsEmpty() && PropertyName != wxT("TYPE")){
+                       
+                               if (FirstToken == TRUE){
+                               
+                                       PropertyTokens.Append(PropertyName + wxT("=") + PropertyValue);
+                                       FirstToken = FALSE;
+                               
+                               } else {
+                               
+                                       PropertyTokens.Append(wxT(";") + PropertyName + wxT("=") + PropertyValue);
+                               
+                               }
+                       
+                       }
+               
+               }
+       
+       }       
+       
+       intPropertyLen = PropertySeg2.Len();
+       SplitPoints.clear();
+       SplitLength.clear();
+       intSplitsFound = 0;
+       intSplitSize = 0;
+       intPrevValue = 0;
+       
+       CaptureString(&PropertySeg2, FALSE);
+       
+       for (int i = 0; i <= intPropertyLen; i++){
+
+               intSplitSize++;
+       
+               if (PropertySeg2.Mid(i, 1) == wxT(";")){
+       
+                       intSplitsFound++;
+                       SplitPoints.insert(std::make_pair(intSplitsFound, (i + 1)));
+                       
+                       if (intSplitsFound == 6){ 
+                       
+                               SplitLength.insert(std::make_pair(intSplitsFound, (intSplitSize - 1)));
+                               break; 
+                               
+                       } else {
+                       
+                               SplitLength.insert(std::make_pair(intSplitsFound, (intSplitSize - 1)));
+                       
+                       }
+                       
+                       intSplitSize = 0;                                       
+       
+               }
+
+       }
+       
+       wxString wxSSoundURI;
+       wxString wxSSoundMIME;
+       wxString wxSSoundEncoding;
+       wxString wxSSoundData;
+       std::string base64enc;
+       
+       if (intSplitsFound == 0){
+       
+       } else {
+       
+               std::map<int, int>::iterator striter;
+       
+               striter = SplitLength.find(1);
+       
+               wxStringTokenizer wSTDataType(PropertySeg2.Mid(0, striter->second), wxT(":"));
+       
+               while (wSTDataType.HasMoreTokens() == TRUE){
+               
+                       wxSSoundURI = wSTDataType.GetNextToken();
+                       wxSSoundMIME = wSTDataType.GetNextToken();
+                       break;
+               
+               }                       
+       
+               wxStringTokenizer wSTDataInfo(PropertySeg2.Mid((striter->second + 1)), wxT(","));                       
+       
+               while (wSTDataInfo.HasMoreTokens() == TRUE){
+               
+                       wxSSoundEncoding = wSTDataInfo.GetNextToken();
+                       wxSSoundData = wSTDataInfo.GetNextToken();                                      
+                       base64enc = wxSSoundData.mb_str();
+                       break;
+               
+               }
+       
+       }
+       
+       // Add the data to the General/Home/Work address variables.
+               
+       switch(PropType){
+               case PROPERTY_NONE:
+                       break;
+               case PROPERTY_HOME:
+                       SoundsListType.insert(std::make_pair(*SoundCount, "home"));
+                       break;
+               case PROPERTY_WORK:
+                       SoundsListType.insert(std::make_pair(*SoundCount, "work"));
+                       break;
+       }
+       
+       SoundsList.insert(std::make_pair(*SoundCount, base64enc));
+       SoundsListAudioEncType.insert(std::make_pair(*SoundCount, wxSSoundEncoding));
+       SoundsListAudioType.insert(std::make_pair(*SoundCount, wxSSoundMIME));
+       
+       if (!PropertyTokens.IsEmpty()){
+       
+               SoundsListTokens.insert(std::make_pair(*SoundCount, PropertyTokens));
+       
+       }
+       
+}
+
+void ContactDataObject::ProcessCalendarURI(wxString PropertySeg1, wxString PropertySeg2, int *CalURICount){
+
+       size_t intPropertyLen = PropertySeg1.Len();
+       std::map<int, int> SplitPoints;
+       std::map<int, int> SplitLength;
+       std::map<int, int>::iterator SLiter;                    
+       wxString PropertyData;
+       wxString PropertyName;
+       wxString PropertyValue;
+       wxString PropertyTokens;
+       bool FirstToken = TRUE;
+       int intSplitsFound = 0;
+       int intSplitSize = 0;
+       int intPrevValue = 8;
+       int intPref = 0;                        
+       int intType = 0;
+       
+       SplitValues(&PropertySeg1, &SplitPoints, &SplitLength, intPrevValue);
        
-       intPrevValue = 8;                       
+       intPrevValue = 7;
        
+       PropertyType PropType = PROPERTY_NONE;
+       
+       // Look for type before continuing.                     
+
+       CheckType(&PropertySeg1, &SplitPoints, &SplitLength, &intPrevValue, &PropType);
+
+       intPrevValue = 7;
+
        for (std::map<int, int>::iterator intiter = SplitPoints.begin(); 
        intiter != SplitPoints.end(); ++intiter){
        
@@ -2749,84 +4695,88 @@ void ContactDataObject::ProcessRelated(wxString PropertySeg1, wxString PropertyS
                        
                        PropertyValue.Remove(0, 1);
                        
-               }
+               }                       
                
                CaptureString(&PropertyValue, FALSE);
-                       
+               
                if (PropertyName == wxT("ALTID")){
 
-                       GeneralRelatedListAltID.erase(*RelatedCount);
-                       GeneralRelatedListAltID.insert(std::make_pair(*RelatedCount, PropertyValue));
+                       CalendarListAltID.erase(*CalURICount);
+                       CalendarListAltID.insert(std::make_pair(*CalURICount, PropertyValue));
                
                } else if (PropertyName == wxT("PID")){
 
-                       GeneralRelatedListPID.erase(*RelatedCount);
-                       GeneralRelatedListPID.insert(std::make_pair(*RelatedCount, PropertyValue));
+                       CalendarListPID.erase(*CalURICount);
+                       CalendarListPID.insert(std::make_pair(*CalURICount, PropertyValue));
                
                } else if (PropertyName == wxT("PREF")){
-                       
-                       int PriorityNumber = 0;
-                       bool ValidNumber = TRUE;
-                       
-                       try{
-                               PriorityNumber = std::stoi(PropertyValue.ToStdString());
-                       }
-                       
-                       catch(std::invalid_argument &e){
-                               ValidNumber = FALSE;
-                       }
-
-                       if (ValidNumber == TRUE){
 
-                               GeneralRelatedListPref.erase(*RelatedCount);
-                               GeneralRelatedListPref.insert(std::make_pair(*RelatedCount, PriorityNumber));
-
-                       }
-               
-               } else if (PropertyName == wxT("LANGUAGE")){
+                       ProcessIntegerValue(&CalendarListPref, &PropertyValue, CalURICount);
                
-                       GeneralRelatedListLanguage.erase(*RelatedCount);
-                       GeneralRelatedListLanguage.insert(std::make_pair(*RelatedCount, PropertyValue));
+               } else if (PropertyName == wxT("MEDIATYPE")){
                
-               } else if (PropertyName != wxT("TYPE")) {
+                       CalendarListMediatype.erase(*CalURICount);
+                       CalendarListMediatype.insert(std::make_pair(*CalURICount, PropertyValue));
+
+               } else {
                
                        // Something else we don't know about so append
                        // to the tokens variable.
-               
+                       
                        if (!PropertyName.IsEmpty() && !PropertyValue.IsEmpty() && PropertyName != wxT("TYPE")){
-               
-                               if (FirstToken == TRUE){
                        
+                               if (FirstToken == TRUE){
+                               
                                        PropertyTokens.Append(PropertyName + wxT("=") + PropertyValue);
                                        FirstToken = FALSE;
-                       
+                               
                                } else {
-                       
+                               
                                        PropertyTokens.Append(wxT(";") + PropertyName + wxT("=") + PropertyValue);
-                       
+                               
                                }
-               
+                       
                        }
                
                }
        
-       }                                       
+       }       
+       
+       intPropertyLen = PropertySeg2.Len();
+       SplitPoints.clear();
+       SplitLength.clear();
+       intSplitsFound = 0;
+       intSplitSize = 0;
+       intPrevValue = 0;
+       
+       CaptureString(&PropertySeg2, FALSE);
        
        // Add the data to the General/Home/Work address variables.
-                               
-       GeneralRelatedList.erase(*RelatedCount);
-       GeneralRelatedListRelType.erase(*RelatedCount);
-       GeneralRelatedListType.erase(*RelatedCount);
-       GeneralRelatedListTokens.erase(*RelatedCount);
-       GeneralRelatedList.insert(std::make_pair(*RelatedCount, PropertySeg2));
-       GeneralRelatedListRelType.insert(std::make_pair(*RelatedCount, RelatedType));                   
-       GeneralRelatedListType.insert(std::make_pair(*RelatedCount, RelatedType));
-       GeneralRelatedListTokens.insert(std::make_pair(*RelatedCount, PropertyTokens));
+               
+       switch(PropType){
+               case PROPERTY_NONE:
+                       break;
+               case PROPERTY_HOME:
+                       CalendarListType.insert(std::make_pair(*CalURICount, "home"));
+                       break;
+               case PROPERTY_WORK:
+                       CalendarListType.insert(std::make_pair(*CalURICount, "work"));
+                       break;
+       }
+       
+       CalendarList.insert(std::make_pair(*CalURICount, PropertySeg2));
+       
+       if (!PropertyTokens.IsEmpty()){
+       
+               CalendarListTokens.insert(std::make_pair(*CalURICount, PropertyTokens));
+       
+       }
 
 }
 
-void ContactDataObject::ProcessURL(wxString PropertySeg1, wxString PropertySeg2, int *URLCount){
+void ContactDataObject::ProcessCalendarAddressURI(wxString PropertySeg1, wxString PropertySeg2, int *CalAdrURICount){
 
+       size_t intPropertyLen = PropertySeg1.Len();
        std::map<int, int> SplitPoints;
        std::map<int, int> SplitLength;
        std::map<int, int>::iterator SLiter;                    
@@ -2835,65 +4785,160 @@ void ContactDataObject::ProcessURL(wxString PropertySeg1, wxString PropertySeg2,
        wxString PropertyValue;
        wxString PropertyTokens;
        bool FirstToken = TRUE;
-       int intPrevValue = 5;
+       int intSplitsFound = 0;
+       int intSplitSize = 0;
+       int intPrevValue = 8;
        int intPref = 0;                        
        int intType = 0;
-       long ListCtrlIndex;
        
        SplitValues(&PropertySeg1, &SplitPoints, &SplitLength, intPrevValue);
        
-       intPrevValue = 4;
+       intPrevValue = 7;
        
        PropertyType PropType = PROPERTY_NONE;
-               
-       // Look for type before continuing.
        
+       // Look for type before continuing.                     
+
        CheckType(&PropertySeg1, &SplitPoints, &SplitLength, &intPrevValue, &PropType);
+
+       intPrevValue = 7;
+
+       for (std::map<int, int>::iterator intiter = SplitPoints.begin(); 
+       intiter != SplitPoints.end(); ++intiter){
        
-       // Setup the pointers.
+               SLiter = SplitLength.find(intiter->first);
        
-       std::map<int, wxString> *WebsiteList = NULL;
-       std::map<int, wxString> *WebsiteListAltID = NULL;
-       std::map<int, wxString> *WebsiteListPID = NULL;
-       std::map<int, wxString> *WebsiteListType = NULL;
-       std::map<int, wxString> *WebsiteListTokens = NULL;
-       std::map<int, wxString> *WebsiteListMediatype = NULL;
-       std::map<int, int> *WebsiteListPref = NULL;
+               PropertyData = PropertySeg1.Mid(intPrevValue, (SLiter->second));
+               
+               wxStringTokenizer PropertyElement (PropertyData, wxT("="));
+               PropertyName = PropertyElement.GetNextToken();                          
+               PropertyValue = PropertyElement.GetNextToken();
+               
+               intPrevValue = intiter->second;
+               
+               // Process properties.
+               
+               size_t intPropertyValueLen = PropertyValue.Len();
+               
+               if (PropertyValue.Mid((intPropertyValueLen - 1), 1) == wxT("\"")){
+                       
+                       PropertyValue.Trim();
+                       PropertyValue.RemoveLast();
+                       
+               }                               
+               
+               if (PropertyValue.Mid(0, 1) == wxT("\"")){
+                       
+                       PropertyValue.Remove(0, 1);
+                       
+               }                       
+               
+               CaptureString(&PropertyValue, FALSE);
+               
+               if (PropertyName == wxT("ALTID")){
+
+                       CalendarRequestListAltID.erase(*CalAdrURICount);
+                       CalendarRequestListAltID.insert(std::make_pair(*CalAdrURICount, PropertyValue));
+               
+               } else if (PropertyName == wxT("PID")){
+
+                       CalendarRequestListPID.erase(*CalAdrURICount);
+                       CalendarRequestListPID.insert(std::make_pair(*CalAdrURICount, PropertyValue));
+               
+               } else if (PropertyName == wxT("PREF")){
+
+                       ProcessIntegerValue(&CalendarRequestListPref, &PropertyValue, CalAdrURICount);
+               
+               } else if (PropertyName == wxT("MEDIATYPE")){
+               
+                       CalendarRequestListMediatype.erase(*CalAdrURICount);
+                       CalendarRequestListMediatype.insert(std::make_pair(*CalAdrURICount, PropertyValue));
+
+               } else {
+               
+                       // Something else we don't know about so append
+                       // to the tokens variable.
+                       
+                       if (!PropertyName.IsEmpty() && !PropertyValue.IsEmpty() && PropertyName != wxT("TYPE")){
+                       
+                               if (FirstToken == TRUE){
+                               
+                                       PropertyTokens.Append(PropertyName + wxT("=") + PropertyValue);
+                                       FirstToken = FALSE;
+                               
+                               } else {
+                               
+                                       PropertyTokens.Append(wxT(";") + PropertyName + wxT("=") + PropertyValue);
+                               
+                               }
+                       
+                       }
+               
+               }
        
-       // Setup blank lines for later on.
+       }       
+       
+       intPropertyLen = PropertySeg2.Len();
+       SplitPoints.clear();
+       SplitLength.clear();
+       intSplitsFound = 0;
+       intSplitSize = 0;
+       intPrevValue = 0;
+       
+       CaptureString(&PropertySeg2, FALSE);
        
+       // Add the data to the General/Home/Work address variables.
+               
        switch(PropType){
                case PROPERTY_NONE:
-                       WebsiteList = &GeneralWebsiteList;
-                       WebsiteListType = &GeneralWebsiteListType;
-                       WebsiteListAltID = &GeneralWebsiteListAltID;
-                       WebsiteListPID = &GeneralWebsiteListPID;
-                       WebsiteListTokens = &GeneralWebsiteListTokens;
-                       WebsiteListMediatype = &GeneralWebsiteListMediatype;
-                       WebsiteListPref = &GeneralWebsiteListPref;      
                        break;
                case PROPERTY_HOME:
-                       WebsiteList = &HomeWebsiteList;
-                       WebsiteListType = &HomeWebsiteListType;
-                       WebsiteListAltID = &HomeWebsiteListAltID;
-                       WebsiteListPID = &HomeWebsiteListPID;
-                       WebsiteListTokens = &HomeWebsiteListTokens;
-                       WebsiteListMediatype = &HomeWebsiteListMediatype;
-                       WebsiteListPref = &HomeWebsiteListPref; 
+                       CalendarRequestListType.insert(std::make_pair(*CalAdrURICount, "home"));
                        break;
                case PROPERTY_WORK:
-                       WebsiteList = &BusinessWebsiteList;
-                       WebsiteListType = &BusinessWebsiteListType;
-                       WebsiteListAltID = &BusinessWebsiteListAltID;
-                       WebsiteListPID = &BusinessWebsiteListPID;
-                       WebsiteListTokens = &BusinessWebsiteListTokens;
-                       WebsiteListMediatype = &BusinessWebsiteListMediatype;   
-                       WebsiteListPref = &BusinessWebsiteListPref;
+                       CalendarRequestListType.insert(std::make_pair(*CalAdrURICount, "work"));
                        break;
        }
        
-       intPrevValue = 4;
+       CalendarRequestList.insert(std::make_pair(*CalAdrURICount, PropertySeg2));
+       
+       if (!PropertyTokens.IsEmpty()){
+       
+               CalendarRequestListTokens.insert(std::make_pair(*CalAdrURICount, PropertyTokens));
+       
+       }       
+       
+}
+
+void ContactDataObject::ProcessCalendarFreeBusy(wxString PropertySeg1, wxString PropertySeg2, int *FreeBusyAddressCount){
+
+       size_t intPropertyLen = PropertySeg1.Len();
+       std::map<int, int> SplitPoints;
+       std::map<int, int> SplitLength;
+       std::map<int, int>::iterator SLiter;                    
+       wxString PropertyData;
+       wxString PropertyName;
+       wxString PropertyValue;
+       wxString PropertyTokens;
+       bool FirstToken = TRUE;
+       int intSplitsFound = 0;
+       int intSplitSize = 0;
+       int intPrevValue = 7;
+       int intPref = 0;                        
+       int intType = 0;
+       
+       SplitValues(&PropertySeg1, &SplitPoints, &SplitLength, intPrevValue);
+       
+       intPrevValue = 6;
+       
+       PropertyType PropType = PROPERTY_NONE;
        
+       // Look for type before continuing.                     
+
+       CheckType(&PropertySeg1, &SplitPoints, &SplitLength, &intPrevValue, &PropType);
+
+       intPrevValue = 6;
+
        for (std::map<int, int>::iterator intiter = SplitPoints.begin(); 
        intiter != SplitPoints.end(); ++intiter){
        
@@ -2922,85 +4967,88 @@ void ContactDataObject::ProcessURL(wxString PropertySeg1, wxString PropertySeg2,
                        
                        PropertyValue.Remove(0, 1);
                        
-               }
+               }                       
                
                CaptureString(&PropertyValue, FALSE);
-               
-               if (PropertyName == wxT("ALTID")){
-
-                       WebsiteListAltID->erase(*URLCount);
-                       WebsiteListAltID->insert(std::make_pair(*URLCount, PropertyValue));
-               
-               } else if (PropertyName == wxT("PID")){
-
-                       WebsiteListPID->erase(*URLCount);
-                       WebsiteListPID->insert(std::make_pair(*URLCount, PropertyValue));
-                       
-               } else if (PropertyName == wxT("PREF")){
-                       
-                       int PriorityNumber = 0;
-                       bool ValidNumber = TRUE;
-                       
-                       try{
-                               PriorityNumber = std::stoi(PropertyValue.ToStdString());
-                       }
-                       
-                       catch(std::invalid_argument &e){
-                               ValidNumber = FALSE;
-                       }
+               
+               if (PropertyName == wxT("ALTID")){
 
-                       if (ValidNumber == TRUE){
+                       FreeBusyListAltID.erase(*FreeBusyAddressCount);
+                       FreeBusyListAltID.insert(std::make_pair(*FreeBusyAddressCount, PropertyValue));
+               
+               } else if (PropertyName == wxT("PID")){
 
-                               WebsiteListPref->erase(*URLCount);
-                               WebsiteListPref->insert(std::make_pair(*URLCount, PriorityNumber));
+                       FreeBusyListPID.erase(*FreeBusyAddressCount);
+                       FreeBusyListPID.insert(std::make_pair(*FreeBusyAddressCount, PropertyValue));
+               
+               } else if (PropertyName == wxT("PREF")){
 
-                       }
-                                       
-               } else if (PropertyName == wxT("MEDIATYPE")){
+                       ProcessIntegerValue(&FreeBusyListPref, &PropertyValue, FreeBusyAddressCount);
                
-                       WebsiteListMediatype->erase(*URLCount);
-                       WebsiteListMediatype->insert(std::make_pair(*URLCount, PropertyValue));
+               } else if (PropertyName == wxT("MEDIATYPE")){
                
+                       FreeBusyListMediatype.erase(*FreeBusyAddressCount);
+                       FreeBusyListMediatype.insert(std::make_pair(*FreeBusyAddressCount, PropertyValue));
+
                } else {
                
                        // Something else we don't know about so append
                        // to the tokens variable.
-               
+                       
                        if (!PropertyName.IsEmpty() && !PropertyValue.IsEmpty() && PropertyName != wxT("TYPE")){
-               
-                               if (FirstToken == TRUE){
                        
+                               if (FirstToken == TRUE){
+                               
                                        PropertyTokens.Append(PropertyName + wxT("=") + PropertyValue);
                                        FirstToken = FALSE;
-                       
+                               
                                } else {
-                       
+                               
                                        PropertyTokens.Append(wxT(";") + PropertyName + wxT("=") + PropertyValue);
-                       
+                               
                                }
-               
+                       
                        }
                
                }
        
-       }
+       }       
        
-       // Add the data to the General/Home/Work address variables.
+       intPropertyLen = PropertySeg2.Len();
+       SplitPoints.clear();
+       SplitLength.clear();
+       intSplitsFound = 0;
+       intSplitSize = 0;
+       intPrevValue = 0;
        
        CaptureString(&PropertySeg2, FALSE);
-                       
-       WebsiteList->insert(std::make_pair(*URLCount, PropertySeg2));
+       
+       // Add the data to the General/Home/Work address variables.
+               
+       switch(PropType){
+               case PROPERTY_NONE:
+                       break;
+               case PROPERTY_HOME:
+                       FreeBusyListType.insert(std::make_pair(*FreeBusyAddressCount, "home"));
+                       break;
+               case PROPERTY_WORK:
+                       FreeBusyListType.insert(std::make_pair(*FreeBusyAddressCount, "work"));
+                       break;
+       }
+       
+       FreeBusyList.insert(std::make_pair(*FreeBusyAddressCount, PropertySeg2));
        
        if (!PropertyTokens.IsEmpty()){
        
-               WebsiteListTokens->insert(std::make_pair(*URLCount, PropertyTokens));
-                       
-       }
+               FreeBusyListTokens.insert(std::make_pair(*FreeBusyAddressCount, PropertyTokens));
        
+       }
+
 }
 
-void ContactDataObject::ProcessTitle(wxString PropertySeg1, wxString PropertySeg2, int *TitleCount){
+void ContactDataObject::ProcessKey(wxString PropertySeg1, wxString PropertySeg2, int *KeyCount){
 
+       size_t intPropertyLen = PropertySeg1.Len();
        std::map<int, int> SplitPoints;
        std::map<int, int> SplitLength;
        std::map<int, int>::iterator SLiter;                    
@@ -3009,65 +5057,25 @@ void ContactDataObject::ProcessTitle(wxString PropertySeg1, wxString PropertySeg
        wxString PropertyValue;
        wxString PropertyTokens;
        bool FirstToken = TRUE;
-       int intPrevValue = 7;
+       int intSplitsFound = 0;
+       int intSplitSize = 0;
+       int intPrevValue = 5;
        int intPref = 0;                        
        int intType = 0;
        long ListCtrlIndex;
        
        SplitValues(&PropertySeg1, &SplitPoints, &SplitLength, intPrevValue);
        
-       intPrevValue = 6;
+       intPrevValue = 4;
        
        PropertyType PropType = PROPERTY_NONE;
-               
-       // Look for type before continuing.
        
+       // Look for type before continuing.
+
        CheckType(&PropertySeg1, &SplitPoints, &SplitLength, &intPrevValue, &PropType);
-       
-       // Setup the pointers.
-       
-       std::map<int, wxString> *TitleList = NULL;
-       std::map<int, wxString> *TitleListAltID = NULL;
-       std::map<int, wxString> *TitleListPID = NULL;
-       std::map<int, wxString> *TitleListType = NULL;
-       std::map<int, wxString> *TitleListTokens = NULL;
-       std::map<int, wxString> *TitleListLanguage = NULL;
-       std::map<int, int> *TitleListPref = NULL;
-       
-       // Setup blank lines for later on.
-       
-       switch(PropType){
-               case PROPERTY_NONE:
-                       TitleList = &GeneralTitleList;
-                       TitleListType = &GeneralTitleListType;
-                       TitleListAltID = &GeneralTitleListAltID;
-                       TitleListPID = &GeneralTitleListPID;
-                       TitleListTokens = &GeneralTitleListTokens;
-                       TitleListLanguage = &GeneralTitleListLanguage;
-                       TitleListPref = &GeneralTitleListPref;  
-                       break;
-               case PROPERTY_HOME:
-                       TitleList = &HomeTitleList;
-                       TitleListType = &HomeTitleListType;
-                       TitleListAltID = &HomeTitleListAltID;
-                       TitleListPID = &HomeTitleListPID;
-                       TitleListTokens = &HomeTitleListTokens;
-                       TitleListLanguage = &HomeTitleListLanguage;
-                       TitleListPref = &HomeTitleListPref;     
-                       break;
-               case PROPERTY_WORK:
-                       TitleList = &BusinessTitleList;
-                       TitleListType = &BusinessTitleListType;
-                       TitleListAltID = &BusinessTitleListAltID;
-                       TitleListPID = &BusinessTitleListPID;
-                       TitleListTokens = &BusinessTitleListTokens;
-                       TitleListLanguage = &BusinessTitleListLanguage; 
-                       TitleListPref = &BusinessTitleListPref;
-                       break;
-       }
 
-       intPrevValue = 6;
-               
+       intPrevValue = 4;
+
        for (std::map<int, int>::iterator intiter = SplitPoints.begin(); 
        intiter != SplitPoints.end(); ++intiter){
        
@@ -3098,60 +5106,110 @@ void ContactDataObject::ProcessTitle(wxString PropertySeg1, wxString PropertySeg
                        
                }                               
                
-               CaptureString(&PropertyValue, FALSE);
-               
                if (PropertyName == wxT("ALTID")){
-               
-                       TitleListAltID->erase(*TitleCount);
-                       TitleListAltID->insert(std::make_pair(*TitleCount, PropertyValue));
+
+                       KeyListAltID.erase(*KeyCount);
+                       KeyListAltID.insert(std::make_pair(*KeyCount, PropertyValue));
                
                } else if (PropertyName == wxT("PID")){
 
-                       TitleListPID->erase(*TitleCount);
-                       TitleListPID->insert(std::make_pair(*TitleCount, PropertyValue));
+                       KeyListPID.erase(*KeyCount);
+                       KeyListPID.insert(std::make_pair(*KeyCount, PropertyValue));
                
                } else if (PropertyName == wxT("PREF")){
-                               
-                       int PriorityNumber = 0;
-                       bool ValidNumber = TRUE;
-                       
-                       try{
-                               PriorityNumber = std::stoi(PropertyValue.ToStdString());
-                       }
-                       
-                       catch(std::invalid_argument &e){
-                               ValidNumber = FALSE;
-                       }
 
-                       if (ValidNumber == TRUE){
-
-                               TitleListPref->erase(*TitleCount);
-                               TitleListPref->insert(std::make_pair(*TitleCount, PriorityNumber));
-
-                       }
-                                       
-               } else if (PropertyName == wxT("LANGUAGE")){
-               
-                       TitleListLanguage->erase(*TitleCount);
-                       TitleListLanguage->insert(std::make_pair(*TitleCount, PropertyValue));
+                       ProcessIntegerValue(&KeyListPref, &PropertyValue, KeyCount);
                
                } else {
                
                        // Something else we don't know about so append
                        // to the tokens variable.
-               
+                       
                        if (!PropertyName.IsEmpty() && !PropertyValue.IsEmpty() && PropertyName != wxT("TYPE")){
-               
-                               if (FirstToken == TRUE){
                        
+                               if (FirstToken == TRUE){
+                               
                                        PropertyTokens.Append(PropertyName + wxT("=") + PropertyValue);
                                        FirstToken = FALSE;
-                       
+                               
                                } else {
-                       
+                               
                                        PropertyTokens.Append(wxT(";") + PropertyName + wxT("=") + PropertyValue);
-                       
+                               
                                }
+                       
+                       }
+               
+               }
+       
+       }                               
+       
+       intPropertyLen = PropertySeg2.Len();
+       SplitPoints.clear();
+       SplitLength.clear();
+       intSplitsFound = 0;
+       intSplitSize = 0;
+       intPrevValue = 0;                       
+       
+       for (int i = 0; i <= intPropertyLen; i++){
+
+               intSplitSize++;
+       
+               if (PropertySeg2.Mid(i, 1) == wxT(";") && PropertySeg2.Mid((i - 1), 1) != wxT("\\")){
+       
+                       intSplitsFound++;
+                       SplitPoints.insert(std::make_pair(intSplitsFound, (i + 1)));
+                       
+                       if (intSplitsFound == 6){ 
+                       
+                               SplitLength.insert(std::make_pair(intSplitsFound, (intSplitSize - 1)));
+                               break; 
+                               
+                       } else {
+                       
+                               SplitLength.insert(std::make_pair(intSplitsFound, (intSplitSize - 1)));
+                       
+                       }
+                       
+                       intSplitSize = 0;                                       
+       
+               }
+
+       }
+       
+       wxString wxSKeyURI;
+       wxString wxSKeyMIME;
+       wxString wxSKeyEncoding;
+       wxString wxSKeyData;
+       std::string base64enc;
+       
+       if (intSplitsFound == 0){
+       
+       } else {
+       
+               std::map<int, int>::iterator striter;
+       
+               striter = SplitLength.find(1);
+       
+               wxStringTokenizer wSTDataType(PropertySeg2.Mid(0, striter->second), wxT(":"));
+       
+               while (wSTDataType.HasMoreTokens() == TRUE){
+               
+                       wxSKeyURI = wSTDataType.GetNextToken();
+                       wxSKeyMIME = wSTDataType.GetNextToken();
+                       break;
+               
+               }                       
+       
+               if (wxSKeyURI == wxT("data")){
+               
+                               wxStringTokenizer wSTDataInfo(PropertySeg2.Mid((striter->second + 1)), wxT(","));                       
+       
+                               while (wSTDataInfo.HasMoreTokens() == TRUE){
+               
+                               wxSKeyEncoding = wSTDataInfo.GetNextToken();
+                               wxSKeyData = wSTDataInfo.GetNextToken();
+                               break;
                
                        }
                
@@ -3161,14 +5219,147 @@ void ContactDataObject::ProcessTitle(wxString PropertySeg1, wxString PropertySeg
        
        // Add the data to the General/Home/Work address variables.
        
-       CaptureString(&PropertySeg2, FALSE);
-
-       TitleList->insert(std::make_pair(*TitleCount, PropertySeg2));
+       if (wxSKeyURI == wxT("data")){
+               
+               KeyListDataEncType.erase(*KeyCount);
+               KeyListKeyType.erase(*KeyCount);
+               KeyListDataEncType.insert(std::make_pair(*KeyCount, wxSKeyEncoding));
+               KeyListKeyType.insert(std::make_pair(*KeyCount, TRUE));
+               
+               KeyList.erase(*KeyCount);
+               KeyList.insert(std::make_pair(*KeyCount, wxSKeyData));
+       
+       } else {
+               
+               KeyList.erase(*KeyCount);
+               KeyList.insert(std::make_pair(*KeyCount, PropertySeg2));
+       
+       }
        
+       KeyListDataType.insert(std::make_pair(*KeyCount, wxSKeyMIME));
+               
+       switch (PropType){
+               case PROPERTY_NONE:
+                       break;
+               case PROPERTY_HOME: 
+                       KeyListType.insert(std::make_pair(*KeyCount, wxT("home")));
+                       break;
+               case PROPERTY_WORK: 
+                       KeyListType.insert(std::make_pair(*KeyCount, wxT("work")));
+                       break;
+       }
+
        if (!PropertyTokens.IsEmpty()){
+
+               KeyListTokens.insert(std::make_pair(*KeyCount, PropertyTokens));
+
+       }
+
+}
+
+void ContactDataObject::ProcessVendor(wxString PropertySeg1, wxString PropertySeg2, int *VendorCount){
+
+       // Split the Vendor three ways.
        
-               TitleListTokens->insert(std::make_pair(*TitleCount, PropertyTokens));
+       wxStringTokenizer wSTVendorDetails(PropertySeg1, wxT("-"));
+       
+       wxString wxSVNDID;
+       wxString wxSVNDPropName;
+       long ListCtrlIndex;                     
+
+       while (wSTVendorDetails.HasMoreTokens() == TRUE){
+       
+               wSTVendorDetails.GetNextToken();
+               wxSVNDID = wSTVendorDetails.GetNextToken();
+               wxSVNDPropName = wSTVendorDetails.GetNextToken();
+               break;
+       
+       }
+       
+       if (!wxSVNDID.IsEmpty() && !wxSVNDPropName.IsEmpty()){
+       
+               // Add the data to the vendor variables.
+       
+               VendorList.erase(*VendorCount);
+               VendorListPEN.erase(*VendorCount);
+               VendorListElement.erase(*VendorCount);
+       
+               VendorList.insert(std::make_pair(*VendorCount, PropertySeg2));
+               VendorListPEN.insert(std::make_pair(*VendorCount, wxSVNDID));
+               VendorListElement.insert(std::make_pair(*VendorCount, wxSVNDPropName));
+       
+       }
+
+}
+
+void ProcessStringValue(wxString *PropertyName,
+       wxString PropertyNameMatch,
+       std::map<int,wxString> *MapPtr,
+       wxString *PropertyValue,
+       int *ItemCount,
+       bool *PropertyMatched){
+       
+       if (*PropertyName == PropertyNameMatch){
+               MapPtr->erase(*ItemCount);
+               MapPtr->insert(std::make_pair(*ItemCount, *PropertyValue));
+               *PropertyMatched = TRUE;
+       }
+       
+}
+
+void ProcessIntegerValue(wxString *PropertyName,
+       wxString PropertyNameMatch,
+       std::map<int,int> *PrefPtr, 
+       wxString *PropertyValue, 
+       int *ItemCount,
+       bool *PropertyMatched){
+
+       if (*PropertyName == PropertyNameMatch){
+               *PropertyMatched = TRUE;
+       } else {
+               return;
+       }
+
+       int PriorityNumber = 0; 
+       bool ValidNumber = TRUE;
+                       
+       try{
+               PriorityNumber = std::stoi(PropertyValue->ToStdString());
+       }
                        
+       catch(std::invalid_argument &e){
+               ValidNumber = FALSE;
+       }
+
+       if (ValidNumber == TRUE){
+
+               PrefPtr->erase(*ItemCount);
+               PrefPtr->insert(std::make_pair(*ItemCount, PriorityNumber));
+
+       }
+
+}
+
+void ProcessIntegerValue(std::map<int,int> *PrefPtr, 
+       wxString *PropertyValue, 
+       int *ItemCount){
+
+       int PriorityNumber = 0; 
+       bool ValidNumber = TRUE;
+                       
+       try{
+               PriorityNumber = std::stoi(PropertyValue->ToStdString());
+       }
+                       
+       catch(std::invalid_argument &e){
+               ValidNumber = FALSE;
+       }
+
+       if (ValidNumber == TRUE){
+
+               PrefPtr->erase(*ItemCount);
+               PrefPtr->insert(std::make_pair(*ItemCount, PriorityNumber));
+
        }
 
 }
Xestia Software Development
Yn Maystri
© 2006 - 2019 Xestia Software Development
Software

Xestia Address Book
Xestia Calendar
Development

Xestia Gelforn
Everything else

About
News
Privacy Policy