Home | News | Projects | Releases
Bugs | RFE | Repositories | Help
Replaced token processing in REV with ProcessTokens.
[xestiaab/.git] / source / contacteditor / ContactDataObject.cpp
index 0b70e28..44a361d 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;
@@ -98,6 +101,16 @@ ContactLoadStatus ContactDataObject::LoadFile(wxString Filename){
        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;
@@ -200,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);
@@ -215,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);
@@ -330,6 +368,64 @@ ContactLoadStatus ContactDataObject::LoadFile(wxString Filename){
                        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++;
+               
                }
                
        }
@@ -363,26 +459,106 @@ 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;
+       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 = 5;
        int intPref = 0;                        
        int intType = 0;
        
        SplitValues(&PropertySeg1, &SplitPoints, &SplitLength, intPrevValue);
+       
+       intPrevValue = 4;
 
-       intPrevValue = 7;
+       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);
+               
+               ProcessTokens(&PropertyName, &PropertyValue, &PropertyTokens, &FirstToken);
+       
+       }       
+       
+       CaptureString(&PropertySeg2, FALSE);
        
+       Revision = PropertySeg2;
+       
+       if (!PropertyTokens.IsEmpty()){
+       
+               RevisionTokens = PropertyTokens;
+       
+       }
+
+
+}
+
+void ContactDataObject::ProcessSource(wxString PropertySeg1, wxString PropertySeg2, int *SourceCount){
+
+       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 PropertyData;
        wxString PropertyTokens;
-       std::map<int,int>::iterator SLiter;
        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 = 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){
        
@@ -396,83 +572,98 @@ 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));
+               }                               
                
-                       }
+               if (PropertyValue.Mid(0, 1) == wxT("\"")){
+                       
+                       PropertyValue.Remove(0, 1);
+                       
+               }                       
                
-               } else if (PropertyName == wxT("MEDIATYPE")){
-
-                       GroupsListMediaType.erase(*GroupCount);
-                       GroupsListMediaType.insert(std::make_pair(*GroupCount, PropertyValue));
+               CaptureString(&PropertyValue, FALSE);
                
-               } else if (!PropertyName.IsEmpty() && !PropertyValue.IsEmpty()){
+               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);
+               
+               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);
-                               
-                       }
                        
+                       }
+               
                }
+       
+       }       
+       
+       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;
        }
-
-       GroupsList.insert(std::make_pair(*GroupCount, PropertySeg2));
-
+       
+       SourceList.insert(std::make_pair(*SourceCount, PropertySeg2));
+       
        if (!PropertyTokens.IsEmpty()){
        
-               GroupsListTokens.insert(std::make_pair(*GroupCount, PropertyTokens));
+               SourceListTokens.insert(std::make_pair(*SourceCount, PropertyTokens));
        
        }
 
-
 }
 
-void ContactDataObject::ProcessFN(wxString PropertySeg1, wxString PropertySeg2, int *FNCount){
+void ContactDataObject::ProcessXML(wxString PropertySeg1, wxString PropertySeg2, int *XMLCount){
 
        std::map<int, int> SplitPoints;
        std::map<int, int> SplitLength;
 
-       int intPrevValue = 4;
+       int intPrevValue = 5;
        int intPref = 0;                        
        int intType = 0;
        
        SplitValues(&PropertySeg1, &SplitPoints, &SplitLength, intPrevValue);
 
-       intPrevValue = 3;
+       intPrevValue = 4;
        
        wxString PropertyName;
        wxString PropertyValue;
@@ -480,6 +671,7 @@ void ContactDataObject::ProcessFN(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){
@@ -495,91 +687,34 @@ void ContactDataObject::ProcessFN(wxString PropertySeg1, wxString PropertySeg2,
                intPrevValue = intiter->second;
                
                CaptureString(&PropertyValue, FALSE);
+       
+               ProcessStringValue(&PropertyName, "ALTID", &XMLListAltID, &PropertyValue, XMLCount, &PropertyMatched);
                
-               if (PropertyName == wxT("TYPE")){
-
-                       if (!PropertyValue.IsEmpty() || PropertyValue == wxT("home") ||
-                               PropertyValue == wxT("work") ){
-
-                               FullNamesListType.erase(*FNCount);
-                               FullNamesListType.insert(std::make_pair(*FNCount, PropertyValue));
-               
-                       }
-               
-               } else if (PropertyName == wxT("LANGUAGE")){
-
-                       FullNamesListLanguage.erase(*FNCount);
-                       FullNamesListLanguage.insert(std::make_pair(*FNCount, PropertyValue));
-               
-               } else if (PropertyName == wxT("ALTID")){
-               
-                       FullNamesListAltID.erase(*FNCount);
-                       FullNamesListAltID.insert(std::make_pair(*FNCount, PropertyValue));
+               if (PropertyMatched == TRUE){
                
-               } else if (PropertyName == wxT("PID")){
-
-                       FullNamesListPID.erase(*FNCount);
-                       FullNamesListPID.insert(std::make_pair(*FNCount, 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){
-
-                               FullNamesListPref.erase(*FNCount);
-                               FullNamesListPref.insert(std::make_pair(*FNCount, PriorityNumber));
-
-                       }
+               }
                
-               } else 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));
-       
-       }
+       XMLList.insert(std::make_pair(*XMLCount, PropertySeg2));
 
 }
 
-void ContactDataObject::ProcessN(wxString PropertySeg1, wxString PropertySeg2){
+void ContactDataObject::ProcessMember(wxString PropertySeg1, wxString PropertySeg2, int *GroupCount){
 
        std::map<int, int> SplitPoints;
        std::map<int, int> SplitLength;
 
-       int intPrevValue = 3;
+       int intPrevValue = 8;
        int intPref = 0;                        
        int intType = 0;
        
        SplitValues(&PropertySeg1, &SplitPoints, &SplitLength, intPrevValue);
-       
-       intPrevValue = 2;
+
+       intPrevValue = 7;
        
        wxString PropertyName;
        wxString PropertyValue;
@@ -587,6 +722,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){
@@ -602,16 +738,180 @@ void ContactDataObject::ProcessN(wxString PropertySeg1, wxString PropertySeg2){
                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 (PropertyName == wxT("ALTID")){
-
-                       NameAltID = PropertyValue;
+               if (PropertyMatched == TRUE){
                
-               } else if (PropertyName == wxT("LANGUAGE")){
+                       PropertyMatched = FALSE;
+                       continue;
                
-                       NameLanguage = PropertyValue;
+               }
                
-               } else if (PropertyName == wxT("SORT-AS")){
+               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){
@@ -723,6 +1023,73 @@ void ContactDataObject::ProcessN(wxString PropertySeg1, wxString PropertySeg2){
 
 }
 
+void ContactDataObject::ProcessClientPIDMap(wxString PropertySeg1, wxString PropertySeg2, int *ClientPIDCount){
+
+       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 = 14;
+       int intPref = 0;                        
+       int intType = 0;
+       
+       SplitValues(&PropertySeg1, &SplitPoints, &SplitLength, intPrevValue);
+       
+       intPrevValue = 13;
+
+       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.
+                               
+               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;
@@ -787,6 +1154,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){
@@ -803,61 +1171,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);
+               
+                       }
+       
                }
                
        }
@@ -1278,6 +1616,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){
@@ -1294,61 +1633,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);
                
                        }
-               
+       
                }
                
        }
@@ -1400,6 +1709,7 @@ void ContactDataObject::ProcessAddress(wxString PropertySeg1, wxString PropertyS
        int intPref = 0;                        
        int intType = 0;
        long ListCtrlIndex;
+       bool PropertyMatched = FALSE;
        
        SplitValues(&PropertySeg1, &SplitPoints, &SplitLength, intPrevValue);
        
@@ -1502,78 +1812,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);
                        
                        }
-               
+                       
                }
        
        }                       
@@ -1625,7 +1892,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;
                
@@ -1636,7 +1902,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){
@@ -1646,7 +1911,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){
@@ -1656,10 +1920,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){
                
@@ -1668,10 +1929,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){
                
@@ -1680,14 +1939,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;
                
                }
@@ -1790,6 +2047,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){
@@ -1808,53 +2066,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){
+               
+                       PropertyMatched = FALSE;
+                       continue;
+               
+               }
                
-               } else if (PropertyName == wxT("PREF")){
+               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);
                        
                        }
-               
+                       
                }
        
        }
@@ -1936,6 +2171,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){
@@ -1952,57 +2188,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);
                        
                        }
                
@@ -2252,6 +2461,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){
        
@@ -2269,50 +2480,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);
+               
+               if (PropertyMatched == TRUE){
+               
+                       PropertyMatched = FALSE;
+                       continue;
                
-               } else if (PropertyName == wxT("PID")){
+               }
 
-                       TelephoneListPID->erase(*TelephoneCount);
-                       TelephoneListPID->insert(std::make_pair(*TelephoneCount, 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){
-
-                               TelephoneListPref->erase(*TelephoneCount);
-                               TelephoneListPref->insert(std::make_pair(*TelephoneCount, 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);
                        
                        }
                
@@ -2393,6 +2581,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){
@@ -2411,50 +2600,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);
                        
                        }
                
@@ -2538,6 +2704,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){
@@ -2556,55 +2723,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);
                        
                        }
                
@@ -2761,6 +2901,8 @@ 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){
        
@@ -2793,61 +2935,31 @@ void ContactDataObject::ProcessRelated(wxString PropertySeg1, wxString PropertyS
                
                CaptureString(&PropertyValue, FALSE);
                        
-               if (PropertyName == wxT("ALTID")){
+               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);
 
-                       GeneralRelatedListAltID.erase(*RelatedCount);
-                       GeneralRelatedListAltID.insert(std::make_pair(*RelatedCount, PropertyValue));
+               if (PropertyMatched == TRUE){
                
-               } else if (PropertyName == wxT("PID")){
-
-                       GeneralRelatedListPID.erase(*RelatedCount);
-                       GeneralRelatedListPID.insert(std::make_pair(*RelatedCount, 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){
-
-                               GeneralRelatedListPref.erase(*RelatedCount);
-                               GeneralRelatedListPref.insert(std::make_pair(*RelatedCount, PriorityNumber));
+               }
 
-                       }
-               
-               } else if (PropertyName == wxT("LANGUAGE")){
-               
-                       GeneralRelatedListLanguage.erase(*RelatedCount);
-                       GeneralRelatedListLanguage.insert(std::make_pair(*RelatedCount, PropertyValue));
-               
-               } else if (PropertyName != wxT("TYPE")) {
+               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);
                
                        }
-               
+       
                }
        
        }                                       
@@ -2933,6 +3045,7 @@ void ContactDataObject::ProcessURL(wxString PropertySeg1, wxString PropertySeg2,
        }
        
        intPrevValue = 4;
+       bool PropertyMatched = FALSE;
        
        for (std::map<int, int>::iterator intiter = SplitPoints.begin(); 
        intiter != SplitPoints.end(); ++intiter){
@@ -2966,61 +3079,31 @@ void ContactDataObject::ProcessURL(wxString PropertySeg1, wxString PropertySeg2,
                
                CaptureString(&PropertyValue, FALSE);
                
-               if (PropertyName == wxT("ALTID")){
-
-                       WebsiteListAltID->erase(*URLCount);
-                       WebsiteListAltID->insert(std::make_pair(*URLCount, PropertyValue));
+               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);
                
-               } 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 (ValidNumber == TRUE){
-
-                               WebsiteListPref->erase(*URLCount);
-                               WebsiteListPref->insert(std::make_pair(*URLCount, PriorityNumber));
-
-                       }
-                                       
-               } else if (PropertyName == wxT("MEDIATYPE")){
+               if (PropertyMatched == TRUE){
                
-                       WebsiteListMediatype->erase(*URLCount);
-                       WebsiteListMediatype->insert(std::make_pair(*URLCount, PropertyValue));
+                       PropertyMatched = FALSE;
+                       continue;
                
-               } 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 (!PropertyName.IsEmpty() && !PropertyValue.IsEmpty() && PropertyName != wxT("TYPE")){
+                               PropertyTokens.Append(PropertyName + wxT("=") + PropertyValue);
+                               FirstToken = FALSE;
                
-                               if (FirstToken == TRUE){
-                       
-                                       PropertyTokens.Append(PropertyName + wxT("=") + PropertyValue);
-                                       FirstToken = FALSE;
-                       
-                               } else {
-                       
-                                       PropertyTokens.Append(wxT(";") + PropertyName + wxT("=") + PropertyValue);
-                       
-                               }
+                       } else {
                
-                       }
+                               PropertyTokens.Append(wxT(";") + PropertyName + wxT("=") + PropertyValue);
                
+                       }
+       
                }
        
        }
@@ -3107,6 +3190,7 @@ void ContactDataObject::ProcessTitle(wxString PropertySeg1, wxString PropertySeg
        }
 
        intPrevValue = 6;
+       bool PropertyMatched = FALSE;
                
        for (std::map<int, int>::iterator intiter = SplitPoints.begin(); 
        intiter != SplitPoints.end(); ++intiter){
@@ -3140,61 +3224,31 @@ void ContactDataObject::ProcessTitle(wxString PropertySeg1, wxString PropertySeg
                
                CaptureString(&PropertyValue, FALSE);
                
-               if (PropertyName == wxT("ALTID")){
+               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);
                
-                       TitleListAltID->erase(*TitleCount);
-                       TitleListAltID->insert(std::make_pair(*TitleCount, PropertyValue));
+               if (PropertyMatched == TRUE){
                
-               } else if (PropertyName == wxT("PID")){
-
-                       TitleListPID->erase(*TitleCount);
-                       TitleListPID->insert(std::make_pair(*TitleCount, 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){
-
-                               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));
-               
-               } 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);
                
                        }
-               
+       
                }
        
        }
@@ -3281,6 +3335,7 @@ void ContactDataObject::ProcessRole(wxString PropertySeg1, wxString PropertySeg2
        }
 
        intPrevValue = 5;
+       bool PropertyMatched = FALSE;
                
        for (std::map<int, int>::iterator intiter = SplitPoints.begin(); 
        intiter != SplitPoints.end(); ++intiter){
@@ -3314,63 +3369,33 @@ void ContactDataObject::ProcessRole(wxString PropertySeg1, wxString PropertySeg2
                
                CaptureString(&PropertyValue, FALSE);
                
-               if (PropertyName == wxT("ALTID")){
-               
-                       RoleListAltID->erase(*RoleCount);
-                       RoleListAltID->insert(std::make_pair(*RoleCount, PropertyValue));
+               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);
                
-               } else if (PropertyName == wxT("PID")){
-
-                       RoleListPID->erase(*RoleCount);
-                       RoleListPID->insert(std::make_pair(*RoleCount, 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){
-
-                               RoleListPref->erase(*RoleCount);
-                               RoleListPref->insert(std::make_pair(*RoleCount, PriorityNumber));
-
-                       }
-                                       
-               } else if (PropertyName == wxT("LANGUAGE")){
+                       PropertyMatched = FALSE;
+                       continue;
                
-                       RoleListLanguage->erase(*RoleCount);
-                       RoleListLanguage->insert(std::make_pair(*RoleCount, PropertyValue));
+               }
                
-               } 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);
                
                        }
-               
-               }
        
+               }
+               
        }
        
        // Add the data to the General/Home/Work address variables.
@@ -3459,6 +3484,7 @@ void ContactDataObject::ProcessOrganisation(wxString PropertySeg1, wxString Prop
        }
 
        intPrevValue = 4;
+       bool PropertyMatched = FALSE;
                
        for (std::map<int, int>::iterator intiter = SplitPoints.begin(); 
        intiter != SplitPoints.end(); ++intiter){
@@ -3492,68 +3518,34 @@ void ContactDataObject::ProcessOrganisation(wxString PropertySeg1, wxString Prop
                
                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));
+               ProcessStringValue(&PropertyName, "ALTID", OrganisationsListAltID, &PropertyValue, OrganisationCount, &PropertyMatched);
+               ProcessStringValue(&PropertyName, "PID", OrganisationsListPID, &PropertyValue, OrganisationCount, &PropertyMatched);
+               ProcessStringValue(&PropertyName, "LANGUAGE", OrganisationsListLanguage, &PropertyValue, OrganisationCount, &PropertyMatched);
+               ProcessStringValue(&PropertyName, "SORT-AS", OrganisationsListSortAs, &PropertyValue, OrganisationCount, &PropertyMatched);
+               ProcessIntegerValue(&PropertyName, "PREF", OrganisationsListPref, &PropertyValue, OrganisationCount, &PropertyMatched);
                
-               } else if (PropertyName == wxT("SORT-AS")){
-
-                       OrganisationsListSortAs->erase(*OrganisationCount);
-                       OrganisationsListSortAs->insert(std::make_pair(*OrganisationCount, 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){
-
-                               OrganisationsListPref->erase(*OrganisationCount);
-                               OrganisationsListPref->insert(std::make_pair(*OrganisationCount, PriorityNumber));
-
-                       }
-                                       
-               } else if (PropertyName == wxT("LANGUAGE")){
+                       PropertyMatched = FALSE;
+                       continue;
                
-                       OrganisationsListLanguage->erase(*OrganisationCount);
-                       OrganisationsListLanguage->insert(std::make_pair(*OrganisationCount, PropertyValue));
+               }
                
-               } 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);
                
                        }
-               
-               }
        
+               }
+
        }
        
        // Add the data to the General/Home/Work address variables.
@@ -3638,6 +3630,7 @@ void ContactDataObject::ProcessNote(wxString PropertySeg1, wxString PropertySeg2
        }
 
        intPrevValue = 5;
+       bool PropertyMatched = FALSE;
                
        for (std::map<int, int>::iterator intiter = SplitPoints.begin(); 
        intiter != SplitPoints.end(); ++intiter){
@@ -3671,61 +3664,31 @@ void ContactDataObject::ProcessNote(wxString PropertySeg1, wxString PropertySeg2
                
                CaptureString(&PropertyValue, FALSE);
                
-               if (PropertyName == wxT("ALTID")){
+               ProcessStringValue(&PropertyName, "ALTID", NoteListAltID, &PropertyValue, NoteCount, &PropertyMatched);
+               ProcessStringValue(&PropertyName, "PID", NoteListPID, &PropertyValue, NoteCount, &PropertyMatched);
+               ProcessStringValue(&PropertyName, "LANGUAGE", NoteListLanguage, &PropertyValue, NoteCount, &PropertyMatched);
+               ProcessIntegerValue(&PropertyName, "PREF", NoteListPref, &PropertyValue, NoteCount, &PropertyMatched);
                
-                       NoteListAltID->erase(*NoteCount);
-                       NoteListAltID->insert(std::make_pair(*NoteCount, PropertyValue));
+               if (PropertyMatched == TRUE){
                
-               } else if (PropertyName == wxT("PID")){
-
-                       NoteListPID->erase(*NoteCount);
-                       NoteListPID->insert(std::make_pair(*NoteCount, 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){
-
-                               NoteListPref->erase(*NoteCount);
-                               NoteListPref->insert(std::make_pair(*NoteCount, PriorityNumber));
+               }
 
-                       }
-                                       
-               } else if (PropertyName == wxT("LANGUAGE")){
-               
-                       NoteListLanguage->erase(*NoteCount);
-                       NoteListLanguage->insert(std::make_pair(*NoteCount, PropertyValue));
-               
-               } 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);
                
                        }
-               
+       
                }
        
        }
@@ -3783,6 +3746,7 @@ void ContactDataObject::ProcessCategory(wxString PropertySeg1, wxString Property
        }
 
        intPrevValue = 11;
+       bool PropertyMatched = FALSE;
                
        for (std::map<int, int>::iterator intiter = SplitPoints.begin(); 
        intiter != SplitPoints.end(); ++intiter){
@@ -3816,61 +3780,31 @@ void ContactDataObject::ProcessCategory(wxString PropertySeg1, wxString Property
                
                CaptureString(&PropertyValue, FALSE);
                
-               if (PropertyName == wxT("ALTID")){
+               ProcessStringValue(&PropertyName, "ALTID", &CategoriesListAltID, &PropertyValue, CategoryCount, &PropertyMatched);
+               ProcessStringValue(&PropertyName, "PID", &CategoriesListPID, &PropertyValue, CategoryCount, &PropertyMatched);
+               ProcessStringValue(&PropertyName, "LANGUAGE", &CategoriesListLanguage, &PropertyValue, CategoryCount, &PropertyMatched);
+               ProcessIntegerValue(&PropertyName, "PREF", &CategoriesListPref, &PropertyValue, CategoryCount, &PropertyMatched);
                
-                       CategoriesListAltID.erase(*CategoryCount);
-                       CategoriesListAltID.insert(std::make_pair(*CategoryCount, PropertyValue));
+               if (PropertyMatched == TRUE){
                
-               } else if (PropertyName == wxT("PID")){
-
-                       CategoriesListPID.erase(*CategoryCount);
-                       CategoriesListPID.insert(std::make_pair(*CategoryCount, 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){
-
-                               CategoriesListPref.erase(*CategoryCount);
-                               CategoriesListPref.insert(std::make_pair(*CategoryCount, PriorityNumber));
+               }
 
-                       }
-                                       
-               } else if (PropertyName == wxT("LANGUAGE")){
-               
-                       CategoriesListLanguage.erase(*CategoryCount);
-                       CategoriesListLanguage.insert(std::make_pair(*CategoryCount, PropertyValue));
-               
-               } 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);
                
                        }
-               
+       
                }
        
        }
@@ -4060,7 +3994,6 @@ void ContactDataObject::ProcessPhoto(wxString PropertySeg1, wxString PropertySeg
        int intPrevValue = 7;
        int intPref = 0;                        
        int intType = 0;
-       long ListCtrlIndex;
        
        SplitValues(&PropertySeg1, &SplitPoints, &SplitLength, intPrevValue);
        
@@ -4073,6 +4006,7 @@ void ContactDataObject::ProcessPhoto(wxString PropertySeg1, wxString PropertySeg
        CheckType(&PropertySeg1, &SplitPoints, &SplitLength, &intPrevValue, &PropType);
 
        intPrevValue = 6;
+       bool PropertyMatched = FALSE;
 
        for (std::map<int, int>::iterator intiter = SplitPoints.begin(); 
        intiter != SplitPoints.end(); ++intiter){
@@ -4106,58 +4040,216 @@ void ContactDataObject::ProcessPhoto(wxString PropertySeg1, wxString PropertySeg
                
                CaptureString(&PropertyValue, FALSE);
                
-               if (PropertyName == wxT("ALTID")){
-
-                       PicturesListAltID.erase(*PhotoCount);
-                       PicturesListAltID.insert(std::make_pair(*PhotoCount, PropertyValue));
+               ProcessStringValue(&PropertyName, "ALTID", &PicturesListAltID, &PropertyValue, PhotoCount, &PropertyMatched);
+               ProcessStringValue(&PropertyName, "PID", &PicturesListPID, &PropertyValue, PhotoCount, &PropertyMatched);
+               ProcessStringValue(&PropertyName, "MEDIATYPE", &PicturesListMediatype, &PropertyValue, PhotoCount, &PropertyMatched);
+               ProcessIntegerValue(&PropertyName, "PREF", &PicturesListPref, &PropertyValue, PhotoCount, &PropertyMatched);
                
-               } else if (PropertyName == wxT("PID")){
+               if (PropertyMatched == TRUE){
+               
+                       PropertyMatched = FALSE;
+                       continue;
+               
+               }
 
-                       PicturesListPID.erase(*PhotoCount);
-                       PicturesListPID.insert(std::make_pair(*PhotoCount, PropertyValue));
+               if (!PropertyName.IsEmpty() && !PropertyValue.IsEmpty() && PropertyName != wxT("TYPE")){
                
-               } else if (PropertyName == wxT("PREF")){
+                       if (FirstToken == TRUE){
+                       
+                               PropertyTokens.Append(PropertyName + wxT("=") + PropertyValue);
+                               FirstToken = FALSE;
                        
-                       int PriorityNumber = 0;
-                       bool ValidNumber = TRUE;
+                       } else {
+                       
+                               PropertyTokens.Append(wxT(";") + PropertyName + wxT("=") + PropertyValue);
                        
-                       try{
-                               PriorityNumber = std::stoi(PropertyValue.ToStdString());
                        }
+               
+               }
+                       
+       }       
+       
+       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)));
                        
-                       catch(std::invalid_argument &e){
-                               ValidNumber = FALSE;
                        }
+                       
+                       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));
+       
+       }
 
-                       if (ValidNumber == TRUE){
+}
 
-                               PicturesListPref.erase(*PhotoCount);
-                               PicturesListPref.insert(std::make_pair(*PhotoCount, PriorityNumber));
+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;
                
-               } else if (PropertyName == wxT("MEDIATYPE")){
+       // Look for type before continuing.
+       
+       CheckType(&PropertySeg1, &SplitPoints, &SplitLength, &intPrevValue, &PropType);
+
+       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));
                
-                       PicturesListMediatype.erase(*PhotoCount);
-                       PicturesListMediatype.insert(std::make_pair(*PhotoCount, PropertyValue));
-                                       
-               } else {
+               wxStringTokenizer PropertyElement (PropertyData, wxT("="));
+               PropertyName = PropertyElement.GetNextToken();                          
+               PropertyValue = PropertyElement.GetNextToken();
                
-                       // Something else we don't know about so append
-                       // to the tokens variable.
+               intPrevValue = intiter->second;
+               
+               // Process properties.
+               
+               size_t intPropertyValueLen = PropertyValue.Len();
+               
+               if (PropertyValue.Mid((intPropertyValueLen - 1), 1) == wxT("\"")){
                        
-                       if (!PropertyName.IsEmpty() && !PropertyValue.IsEmpty() && PropertyName != wxT("TYPE")){
+                       PropertyValue.Trim();
+                       PropertyValue.RemoveLast();
                        
-                               if (FirstToken == TRUE){
-                               
-                                       PropertyTokens.Append(PropertyName + wxT("=") + PropertyValue);
-                                       FirstToken = FALSE;
-                               
-                               } else {
-                               
-                                       PropertyTokens.Append(wxT(";") + PropertyName + wxT("=") + PropertyValue);
-                               
-                               }
+               }                               
+               
+               if (PropertyValue.Mid(0, 1) == wxT("\"")){
+                       
+                       PropertyValue.Remove(0, 1);
+                       
+               }
+               
+               CaptureString(&PropertyValue, FALSE);
+               
+               ProcessStringValue(&PropertyName, "ALTID", &LogosListAltID, &PropertyValue, LogoCount, &PropertyMatched);
+               ProcessStringValue(&PropertyName, "PID", &LogosListPID, &PropertyValue, LogoCount, &PropertyMatched);
+               ProcessStringValue(&PropertyName, "MEDIATYPE", &LogosListMediatype, &PropertyValue, LogoCount, &PropertyMatched);
+               ProcessIntegerValue(&PropertyName, "PREF", &LogosListPref, &PropertyValue, LogoCount, &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);
                        
                        }
                
@@ -4229,7 +4321,7 @@ void ContactDataObject::ProcessPhoto(wxString PropertySeg1, wxString PropertySeg
                while (wSTDataInfo.HasMoreTokens() == TRUE){
                
                        wxSPhotoEncoding = wSTDataInfo.GetNextToken();
-                       wxSPhotoData = wSTDataInfo.GetNextToken();                                      
+                       wxSPhotoData = wSTDataInfo.GetNextToken();
                        base64enc = wxSPhotoData.mb_str();
                        break;
                
@@ -4239,29 +4331,891 @@ void ContactDataObject::ProcessPhoto(wxString PropertySeg1, wxString PropertySeg
        
        // 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));
+       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:
-                       PicturesListType.insert(std::make_pair(*PhotoCount, "home"));
+                       LogosListType.insert(std::make_pair(*LogoCount, "home"));
                        break;
                case PROPERTY_WORK:
-                       PicturesListType.insert(std::make_pair(*PhotoCount, "work"));
+                       LogosListType.insert(std::make_pair(*LogoCount, "work"));
                        break;
        }
        
        if (!PropertyTokens.IsEmpty()){
 
-               PicturesListTokens.insert(std::make_pair(*PhotoCount, PropertyTokens));
+               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;
+       bool PropertyMatched = FALSE;
+
+       for (std::map<int, int>::iterator intiter = SplitPoints.begin(); 
+       intiter != SplitPoints.end(); ++intiter){
        
+               SLiter = SplitLength.find(intiter->first);
        
-       PhotoCount++;
+               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", &SoundsListAltID, &PropertyValue, SoundCount, &PropertyMatched);
+               ProcessStringValue(&PropertyName, "PID", &SoundsListPID, &PropertyValue, SoundCount, &PropertyMatched);
+               ProcessStringValue(&PropertyName, "MEDIATYPE", &SoundsListMediatype, &PropertyValue, SoundCount, &PropertyMatched);
+               ProcessStringValue(&PropertyName, "LANGUAGE", &SoundsListLanguage, &PropertyValue, SoundCount, &PropertyMatched);
+               ProcessIntegerValue(&PropertyName, "PREF", &SoundsListPref, &PropertyValue, SoundCount, &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);
+                       
+                       }
+               
+               }
+       
+       }       
+       
+       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 = 7;
+       
+       PropertyType PropType = PROPERTY_NONE;
+       
+       // Look for type before continuing.                     
+
+       CheckType(&PropertySeg1, &SplitPoints, &SplitLength, &intPrevValue, &PropType);
+
+       intPrevValue = 7;
+       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", &CalendarListAltID, &PropertyValue, CalURICount, &PropertyMatched);
+               ProcessStringValue(&PropertyName, "PID", &CalendarListPID, &PropertyValue, CalURICount, &PropertyMatched);
+               ProcessStringValue(&PropertyName, "MEDIATYPE", &CalendarListMediatype, &PropertyValue, CalURICount, &PropertyMatched);
+               ProcessIntegerValue(&PropertyName, "PREF", &CalendarListPref, &PropertyValue, CalURICount, &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);
+                       
+                       }
+               
+               }
+       
+       }       
+       
+       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:
+                       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::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;                    
+       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 = 7;
+       
+       PropertyType PropType = PROPERTY_NONE;
+       
+       // Look for type before continuing.                     
+
+       CheckType(&PropertySeg1, &SplitPoints, &SplitLength, &intPrevValue, &PropType);
+
+       intPrevValue = 7;
+       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", &CalendarRequestListAltID, &PropertyValue, CalAdrURICount, &PropertyMatched);
+               ProcessStringValue(&PropertyName, "PID", &CalendarRequestListPID, &PropertyValue, CalAdrURICount, &PropertyMatched);
+               ProcessStringValue(&PropertyName, "MEDIATYPE", &CalendarRequestListMediatype, &PropertyValue, CalAdrURICount, &PropertyMatched);
+               ProcessIntegerValue(&PropertyName, "PREF", &CalendarRequestListPref, &PropertyValue, CalAdrURICount, &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);
+                       
+                       }
+               
+               }
+       
+       }       
+       
+       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:
+                       CalendarRequestListType.insert(std::make_pair(*CalAdrURICount, "home"));
+                       break;
+               case PROPERTY_WORK:
+                       CalendarRequestListType.insert(std::make_pair(*CalAdrURICount, "work"));
+                       break;
+       }
+       
+       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;
+       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", &FreeBusyListAltID, &PropertyValue, FreeBusyAddressCount, &PropertyMatched);
+               ProcessStringValue(&PropertyName, "PID", &FreeBusyListPID, &PropertyValue, FreeBusyAddressCount, &PropertyMatched);
+               ProcessStringValue(&PropertyName, "MEDIATYPE", &FreeBusyListMediatype, &PropertyValue, FreeBusyAddressCount, &PropertyMatched);
+               ProcessIntegerValue(&PropertyName, "PREF", &FreeBusyListPref, &PropertyValue, FreeBusyAddressCount, &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);
+                       
+                       }
+               
+               }
+       
+       }       
+       
+       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:
+                       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()){
+       
+               FreeBusyListTokens.insert(std::make_pair(*FreeBusyAddressCount, PropertyTokens));
+       
+       }
+
+}
+
+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;                    
+       wxString PropertyData;
+       wxString PropertyName;
+       wxString PropertyValue;
+       wxString PropertyTokens;
+       bool FirstToken = TRUE;
+       int intSplitsFound = 0;
+       int intSplitSize = 0;
+       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);
+
+       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);
+                       
+               }
+               
+               ProcessStringValue(&PropertyName, "ALTID", &KeyListAltID, &PropertyValue, KeyCount, &PropertyMatched);
+               ProcessStringValue(&PropertyName, "PID", &KeyListPID, &PropertyValue, KeyCount, &PropertyMatched);
+               ProcessIntegerValue(&PropertyName, "PREF", &KeyListPref, &PropertyValue, KeyCount, &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);
+                       
+                       }
+               
+               }
+       
+       }                               
+       
+       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;
+               
+                       }
+               
+               }
+       
+       }
+       
+       // Add the data to the General/Home/Work address variables.
+       
+       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.
+       
+       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 ProcessTokens(wxString *PropertyName,
+       wxString *PropertyValue,
+       wxString *PropertyTokens,
+       bool *FirstToken){
+       
+       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);
+                       
+               }
+               
+       }
+       
+}
+
+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));
+
+       }
 
 }
 
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