X-Git-Url: http://Server1/repobrowser/?a=blobdiff_plain;ds=sidebyside;f=source%2Fcontacteditor%2FContactDataObject.cpp;h=4c2cbc6442b59b4a7a07daaeb18a85a758834c66;hb=b22d89925df6f435578ae08c37f91d73ee2bdda7;hp=05241d287ad83a5a12fbd676d313a21acd2c8145;hpb=d5e5a52dfa7ba94138977833034789f794740134;p=xestiaab%2F.git diff --git a/source/contacteditor/ContactDataObject.cpp b/source/contacteditor/ContactDataObject.cpp index 05241d2..4c2cbc6 100644 --- a/source/contacteditor/ContactDataObject.cpp +++ b/source/contacteditor/ContactDataObject.cpp @@ -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; @@ -100,7 +103,14 @@ ContactLoadStatus ContactDataObject::LoadFile(wxString Filename){ int PhotoCount = 0; int LogoCount = 0; int SoundCount = 0; - int CalAdrCount = 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; @@ -203,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); @@ -218,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); @@ -358,8 +393,38 @@ ContactLoadStatus ContactDataObject::LoadFile(wxString Filename){ // See frmContactEditor-LoadCalendar.cpp - ProcessCalendarURI(PropertySeg1, PropertySeg2, &CalAdrCount); - CalAdrCount++; + 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++; } @@ -394,26 +459,27 @@ void ContactDataObject::ProcessKind(wxString KindType){ } -void ContactDataObject::ProcessMember(wxString PropertySeg1, wxString PropertySeg2, int *GroupCount){ +void ContactDataObject::ProcessRevision(wxString PropertySeg1, wxString PropertySeg2){ + size_t intPropertyLen = PropertySeg1.Len(); std::map SplitPoints; std::map SplitLength; - - int intPrevValue = 8; - int intPref = 0; - int intType = 0; - - SplitValues(&PropertySeg1, &SplitPoints, &SplitLength, intPrevValue); - - intPrevValue = 7; - + std::map::iterator SLiter; + wxString PropertyData; wxString PropertyName; wxString PropertyValue; - wxString PropertyData; wxString PropertyTokens; - std::map::iterator SLiter; bool FirstToken = TRUE; + int intSplitsFound = 0; + int intSplitSize = 0; + int intPrevValue = 5; + int intPref = 0; + int intType = 0; + + SplitValues(&PropertySeg1, &SplitPoints, &SplitLength, intPrevValue); + intPrevValue = 4; + for (std::map::iterator intiter = SplitPoints.begin(); intiter != SplitPoints.end(); ++intiter){ @@ -427,91 +493,81 @@ void ContactDataObject::ProcessMember(wxString PropertySeg1, wxString PropertySe intPrevValue = intiter->second; - CaptureString(&PropertyValue, FALSE); - - if (PropertyName == wxT("ALTID")){ - - GroupsListAltID.erase(*GroupCount); - GroupsListAltID.insert(std::make_pair(*GroupCount, PropertyValue)); + // Process properties. - } else if (PropertyName == wxT("PID")){ - - GroupsListPID.erase(*GroupCount); - GroupsListPID.insert(std::make_pair(*GroupCount, PropertyValue)); + size_t intPropertyValueLen = PropertyValue.Len(); - } else if (PropertyName == wxT("PREF")){ - - int PriorityNumber = 0; - bool ValidNumber = TRUE; + if (PropertyValue.Mid((intPropertyValueLen - 1), 1) == wxT("\"")){ - try{ - PriorityNumber = std::stoi(PropertyValue.ToStdString()); - } + PropertyValue.Trim(); + PropertyValue.RemoveLast(); - catch(std::invalid_argument &e){ - ValidNumber = FALSE; - } - - if (ValidNumber == TRUE){ - - GroupsListPref.erase(*GroupCount); - GroupsListPref.insert(std::make_pair(*GroupCount, PriorityNumber)); - - } - - } else if (PropertyName == wxT("MEDIATYPE")){ - - GroupsListMediaType.erase(*GroupCount); - GroupsListMediaType.insert(std::make_pair(*GroupCount, PropertyValue)); + } - } else if (!PropertyName.IsEmpty() && !PropertyValue.IsEmpty()){ + if (PropertyValue.Mid(0, 1) == wxT("\"")){ - if (FirstToken == TRUE){ + PropertyValue.Remove(0, 1); + + } + + CaptureString(&PropertyValue, FALSE); + + if (FirstToken == TRUE){ - PropertyTokens.Append(PropertyName + wxT("=") + PropertyValue); - FirstToken = FALSE; + PropertyTokens.Append(PropertyName + wxT("=") + PropertyValue); + FirstToken = FALSE; - } else { - - PropertyTokens.Append(wxT(";") + PropertyName + wxT("=") + PropertyValue); + } else { + + PropertyTokens.Append(wxT(";") + PropertyName + wxT("=") + PropertyValue); - } - } - - } - - GroupsList.insert(std::make_pair(*GroupCount, PropertySeg2)); - + + } + + CaptureString(&PropertySeg2, FALSE); + + Revision = PropertySeg2; + if (!PropertyTokens.IsEmpty()){ - GroupsListTokens.insert(std::make_pair(*GroupCount, PropertyTokens)); + RevisionTokens = PropertyTokens; } } -void ContactDataObject::ProcessFN(wxString PropertySeg1, wxString PropertySeg2, int *FNCount){ +void ContactDataObject::ProcessSource(wxString PropertySeg1, wxString PropertySeg2, int *SourceCount){ + size_t intPropertyLen = PropertySeg1.Len(); std::map SplitPoints; std::map SplitLength; - - int intPrevValue = 4; + std::map::iterator SLiter; + wxString PropertyData; + wxString PropertyName; + wxString PropertyValue; + wxString PropertyTokens; + bool FirstToken = TRUE; + bool PropertyMatched = FALSE; + int intSplitsFound = 0; + int intSplitSize = 0; + int intPrevValue = 8; int intPref = 0; int intType = 0; SplitValues(&PropertySeg1, &SplitPoints, &SplitLength, intPrevValue); - - intPrevValue = 3; - wxString PropertyName; - wxString PropertyValue; - wxString PropertyData; - wxString PropertyTokens; - std::map::iterator SLiter; - bool FirstToken = TRUE; + intPrevValue = 7; + + PropertyType PropType = PROPERTY_NONE; + // Look for type before continuing. + + CheckType(&PropertySeg1, &SplitPoints, &SplitLength, &intPrevValue, &PropType); + + intPrevValue = 7; + for (std::map::iterator intiter = SplitPoints.begin(); intiter != SplitPoints.end(); ++intiter){ @@ -525,92 +581,98 @@ void ContactDataObject::ProcessFN(wxString PropertySeg1, wxString PropertySeg2, intPrevValue = intiter->second; - CaptureString(&PropertyValue, FALSE); + // Process properties. - if (PropertyName == wxT("TYPE")){ - - if (!PropertyValue.IsEmpty() || PropertyValue == wxT("home") || - PropertyValue == wxT("work") ){ - - FullNamesListType.erase(*FNCount); - FullNamesListType.insert(std::make_pair(*FNCount, PropertyValue)); + size_t intPropertyValueLen = PropertyValue.Len(); - } + if (PropertyValue.Mid((intPropertyValueLen - 1), 1) == wxT("\"")){ + + PropertyValue.Trim(); + PropertyValue.RemoveLast(); + + } - } else if (PropertyName == wxT("LANGUAGE")){ - - FullNamesListLanguage.erase(*FNCount); - FullNamesListLanguage.insert(std::make_pair(*FNCount, PropertyValue)); + if (PropertyValue.Mid(0, 1) == wxT("\"")){ + + PropertyValue.Remove(0, 1); + + } - } else if (PropertyName == wxT("ALTID")){ + CaptureString(&PropertyValue, FALSE); - FullNamesListAltID.erase(*FNCount); - FullNamesListAltID.insert(std::make_pair(*FNCount, PropertyValue)); + ProcessStringValue(&PropertyName, "ALTID", &SourceListAltID, &PropertyValue, SourceCount, &PropertyMatched); + ProcessStringValue(&PropertyName, "PID", &SourceListPID, &PropertyValue, SourceCount, &PropertyMatched); + ProcessStringValue(&PropertyName, "MEDIATYPE", &SourceListMediatype, &PropertyValue, SourceCount, &PropertyMatched); + ProcessIntegerValue(&PropertyName, "PREF", &SourceListPref, &PropertyValue, SourceCount, &PropertyMatched); - } else if (PropertyName == wxT("PID")){ - - FullNamesListPID.erase(*FNCount); - FullNamesListPID.insert(std::make_pair(*FNCount, PropertyValue)); + if (PropertyMatched == TRUE){ - } else if (PropertyName == wxT("PREF")){ - - int PriorityNumber = 0; - bool ValidNumber = TRUE; - - try{ - PriorityNumber = std::stoi(PropertyValue.ToStdString()); - } - - catch(std::invalid_argument &e){ - ValidNumber = FALSE; - } - - if (ValidNumber == TRUE){ - - FullNamesListPref.erase(*FNCount); - FullNamesListPref.insert(std::make_pair(*FNCount, PriorityNumber)); - - } + PropertyMatched = FALSE; + continue; - } else if (!PropertyName.IsEmpty() && !PropertyValue.IsEmpty()){ + } + + if (!PropertyName.IsEmpty() && !PropertyValue.IsEmpty() && PropertyName != wxT("TYPE")){ if (FirstToken == TRUE){ PropertyTokens.Append(PropertyName + wxT("=") + PropertyValue); FirstToken = FALSE; - + } else { PropertyTokens.Append(wxT(";") + PropertyName + wxT("=") + PropertyValue); - - } - } + } + + } + + } + intPropertyLen = PropertySeg2.Len(); + SplitPoints.clear(); + SplitLength.clear(); + intSplitsFound = 0; + intSplitSize = 0; + intPrevValue = 0; + + CaptureString(&PropertySeg2, FALSE); + + // Add the data to the General/Home/Work address variables. + + switch(PropType){ + case PROPERTY_NONE: + break; + case PROPERTY_HOME: + SourceListType.insert(std::make_pair(*SourceCount, "home")); + break; + case PROPERTY_WORK: + SourceListType.insert(std::make_pair(*SourceCount, "work")); + break; } - - FullNamesList.insert(std::make_pair(*FNCount, PropertySeg2)); - + + SourceList.insert(std::make_pair(*SourceCount, PropertySeg2)); + if (!PropertyTokens.IsEmpty()){ - FullNamesListTokens.insert(std::make_pair(*FNCount, PropertyTokens)); + SourceListTokens.insert(std::make_pair(*SourceCount, PropertyTokens)); } } -void ContactDataObject::ProcessN(wxString PropertySeg1, wxString PropertySeg2){ +void ContactDataObject::ProcessXML(wxString PropertySeg1, wxString PropertySeg2, int *XMLCount){ std::map SplitPoints; std::map SplitLength; - int intPrevValue = 3; + int intPrevValue = 5; int intPref = 0; int intType = 0; SplitValues(&PropertySeg1, &SplitPoints, &SplitLength, intPrevValue); - - intPrevValue = 2; + + intPrevValue = 4; wxString PropertyName; wxString PropertyValue; @@ -633,25 +695,246 @@ void ContactDataObject::ProcessN(wxString PropertySeg1, wxString PropertySeg2){ 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")){ + XMLListAltID.erase(*XMLCount); + XMLListAltID.insert(std::make_pair(*XMLCount, PropertyValue)); - if (PropertyValue.Left(1) == wxT("\"") && PropertyValue.Right(1) == wxT("\"") && - PropertyValue.Len() >= 3){ - NameDisplayAs = PropertyValue.Mid(1, (PropertyValue.Len() - 2)); - } + } - } else if (!PropertyName.IsEmpty() && !PropertyValue.IsEmpty()){ - - if (FirstToken == TRUE){ + } + + XMLList.insert(std::make_pair(*XMLCount, PropertySeg2)); + +} + +void ContactDataObject::ProcessMember(wxString PropertySeg1, wxString PropertySeg2, int *GroupCount){ + + std::map SplitPoints; + std::map SplitLength; + + int intPrevValue = 8; + int intPref = 0; + int intType = 0; + + SplitValues(&PropertySeg1, &SplitPoints, &SplitLength, intPrevValue); + + intPrevValue = 7; + + wxString PropertyName; + wxString PropertyValue; + wxString PropertyData; + wxString PropertyTokens; + std::map::iterator SLiter; + bool FirstToken = TRUE; + + for (std::map::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")){ + + GroupsListAltID.erase(*GroupCount); + GroupsListAltID.insert(std::make_pair(*GroupCount, PropertyValue)); + + } else if (PropertyName == wxT("PID")){ + + GroupsListPID.erase(*GroupCount); + GroupsListPID.insert(std::make_pair(*GroupCount, PropertyValue)); + + } else if (PropertyName == wxT("PREF")){ + + ProcessIntegerValue(&GroupsListPref, &PropertyValue, GroupCount); + + } else if (PropertyName == wxT("MEDIATYPE")){ + + GroupsListMediaType.erase(*GroupCount); + GroupsListMediaType.insert(std::make_pair(*GroupCount, PropertyValue)); + + } else 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 SplitPoints; + std::map 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::iterator SLiter; + bool FirstToken = TRUE; + + for (std::map::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)); + + } + + } 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)); + + } else if (PropertyName == wxT("PID")){ + + FullNamesListPID.erase(*FNCount); + FullNamesListPID.insert(std::make_pair(*FNCount, PropertyValue)); + + } else if (PropertyName == wxT("PREF")){ + + ProcessIntegerValue(&FullNamesListPref, &PropertyValue, FNCount); + + } 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)); + + } + +} + +void ContactDataObject::ProcessN(wxString PropertySeg1, wxString PropertySeg2){ + + std::map SplitPoints; + std::map 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::iterator SLiter; + bool FirstToken = TRUE; + + for (std::map::iterator intiter = SplitPoints.begin(); + intiter != SplitPoints.end(); ++intiter){ + + SLiter = SplitLength.find(intiter->first); + + PropertyData = PropertySeg1.Mid(intPrevValue, (SLiter->second)); + + wxStringTokenizer PropertyElement (PropertyData, wxT("=")); + PropertyName = PropertyElement.GetNextToken(); + PropertyValue = PropertyElement.GetNextToken(); + + intPrevValue = intiter->second; + + CaptureString(&PropertyValue, FALSE); + + if (PropertyName == wxT("ALTID")){ + + NameAltID = PropertyValue; + + } else if (PropertyName == wxT("LANGUAGE")){ + + NameLanguage = PropertyValue; + + } else if (PropertyName == wxT("SORT-AS")){ + + if (PropertyValue.Left(1) == wxT("\"") && PropertyValue.Right(1) == wxT("\"") && + PropertyValue.Len() >= 3){ + NameDisplayAs = PropertyValue.Mid(1, (PropertyValue.Len() - 2)); + } + + } else if (!PropertyName.IsEmpty() && !PropertyValue.IsEmpty()){ + + if (FirstToken == TRUE){ PropertyTokens.Append(PropertyName + wxT("=") + PropertyValue); FirstToken = FALSE; @@ -754,28 +1037,112 @@ void ContactDataObject::ProcessN(wxString PropertySeg1, wxString PropertySeg2){ } -void ContactDataObject::ProcessNickname(wxString PropertySeg1, wxString PropertySeg2, int *NicknameCount){ +void ContactDataObject::ProcessClientPIDMap(wxString PropertySeg1, wxString PropertySeg2, int *ClientPIDCount){ + size_t intPropertyLen = PropertySeg1.Len(); std::map SplitPoints; std::map SplitLength; - - int intPrevValue = 10; + std::map::iterator SLiter; + wxString PropertyData; + wxString PropertyName; + wxString PropertyValue; + wxString PropertyTokens; + bool FirstToken = TRUE; + int intSplitsFound = 0; + int intSplitSize = 0; + int intPrevValue = 14; int intPref = 0; + int intType = 0; SplitValues(&PropertySeg1, &SplitPoints, &SplitLength, intPrevValue); - intPrevValue = 9; - - PropertyType PropType = PROPERTY_NONE; - - // Look for type before continuing. - - CheckType(&PropertySeg1, &SplitPoints, &SplitLength, &intPrevValue, &PropType); + intPrevValue = 13; + + for (std::map::iterator intiter = SplitPoints.begin(); + intiter != SplitPoints.end(); ++intiter){ - intPrevValue = 9; + SLiter = SplitLength.find(intiter->first); - std::map *NicknamesList = NULL; - std::map *NicknamesListType = NULL; + PropertyData = PropertySeg1.Mid(intPrevValue, (SLiter->second)); + + wxStringTokenizer PropertyElement (PropertyData, wxT("=")); + PropertyName = PropertyElement.GetNextToken(); + PropertyValue = PropertyElement.GetNextToken(); + + intPrevValue = intiter->second; + + // Process properties. + + size_t intPropertyValueLen = PropertyValue.Len(); + + if (PropertyValue.Mid((intPropertyValueLen - 1), 1) == wxT("\"")){ + + PropertyValue.Trim(); + PropertyValue.RemoveLast(); + + } + + if (PropertyValue.Mid(0, 1) == wxT("\"")){ + + PropertyValue.Remove(0, 1); + + } + + CaptureString(&PropertyValue, FALSE); + + if (PropertyName.IsEmpty() || PropertyName.IsEmpty()){ + + continue; + + } + + 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 SplitPoints; + std::map SplitLength; + + int intPrevValue = 10; + int intPref = 0; + + SplitValues(&PropertySeg1, &SplitPoints, &SplitLength, intPrevValue); + + intPrevValue = 9; + + PropertyType PropType = PROPERTY_NONE; + + // Look for type before continuing. + + CheckType(&PropertySeg1, &SplitPoints, &SplitLength, &intPrevValue, &PropType); + + intPrevValue = 9; + + std::map *NicknamesList = NULL; + std::map *NicknamesListType = NULL; std::map *NicknamesListLanguage = NULL; std::map *NicknamesListAltID = NULL; std::map *NicknamesListPID = NULL; @@ -846,23 +1213,7 @@ void ContactDataObject::ProcessNickname(wxString PropertySeg1, wxString Property } 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)); - - } + ProcessIntegerValue(NicknamesListPref, &PropertyValue, NicknameCount); } else if (PropertyName == wxT("LANGUAGE")){ @@ -1337,23 +1688,7 @@ void ContactDataObject::ProcessTimeZone(wxString PropertySeg1, wxString Property } 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)); - - } + ProcessIntegerValue(TZListPref, &PropertyValue, TimeZoneCount); } else if (PropertyName == wxT("MEDIATYPE")){ @@ -1569,24 +1904,8 @@ void ContactDataObject::ProcessAddress(wxString PropertySeg1, wxString PropertyS AddressListMediatype->insert(std::make_pair(*AddressCount, 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){ - AddressListPref->erase(*AddressCount); - AddressListPref->insert(std::make_pair(*AddressCount, PriorityNumber)); - - } + ProcessIntegerValue(AddressListPref, &PropertyValue, AddressCount); } else { @@ -1851,23 +2170,7 @@ void ContactDataObject::ProcessEmail(wxString PropertySeg1, wxString PropertySeg } 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){ - - EmailListPref->erase(*EmailCount); - EmailListPref->insert(std::make_pair(*EmailCount, PriorityNumber)); - - } + ProcessIntegerValue(EmailListPref, &PropertyValue, EmailCount); } else { @@ -2002,23 +2305,7 @@ void ContactDataObject::ProcessIM(wxString PropertySeg1, wxString PropertySeg2, } 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){ - - IMListPref->erase(*IMCount); - IMListPref->insert(std::make_pair(*IMCount, PriorityNumber)); - - } + ProcessIntegerValue(IMListPref, &PropertyValue, IMCount); } else { @@ -2311,24 +2598,8 @@ void ContactDataObject::ProcessTelephone(wxString PropertySeg1, wxString Propert TelephoneListPID->insert(std::make_pair(*TelephoneCount, 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){ - - TelephoneListPref->erase(*TelephoneCount); - TelephoneListPref->insert(std::make_pair(*TelephoneCount, PriorityNumber)); - - } + ProcessIntegerValue(TelephoneListPref, &PropertyValue, TelephoneCount); } else { @@ -2454,23 +2725,7 @@ void ContactDataObject::ProcessLanguage(wxString PropertySeg1, wxString Property } 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)); - - } + ProcessIntegerValue(LanguageListPref, &PropertyValue, LanguageCount); } else { @@ -2603,24 +2858,8 @@ void ContactDataObject::ProcessGeographic(wxString PropertySeg1, wxString Proper GeopositionListMediatype->insert(std::make_pair(*GeographicCount, 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){ - - GeopositionListPref->erase(*GeographicCount); - GeopositionListPref->insert(std::make_pair(*GeographicCount, PriorityNumber)); - } + ProcessIntegerValue(GeopositionListPref, &PropertyValue, GeographicCount); } else { @@ -2855,9 +3094,8 @@ void ContactDataObject::ProcessRelated(wxString PropertySeg1, wxString PropertyS } } else if (PropertyName == wxT("LANGUAGE")){ - - GeneralRelatedListLanguage.erase(*RelatedCount); - GeneralRelatedListLanguage.insert(std::make_pair(*RelatedCount, PropertyValue)); + + ProcessIntegerValue(&GeneralRelatedListPref, &PropertyValue, RelatedCount); } else if (PropertyName != wxT("TYPE")) { @@ -2953,18 +3191,334 @@ void ContactDataObject::ProcessURL(wxString PropertySeg1, wxString PropertySeg2, WebsiteListPref = &HomeWebsiteListPref; break; case PROPERTY_WORK: - WebsiteList = &BusinessWebsiteList; - WebsiteListType = &BusinessWebsiteListType; - WebsiteListAltID = &BusinessWebsiteListAltID; - WebsiteListPID = &BusinessWebsiteListPID; - WebsiteListTokens = &BusinessWebsiteListTokens; - WebsiteListMediatype = &BusinessWebsiteListMediatype; - WebsiteListPref = &BusinessWebsiteListPref; + WebsiteList = &BusinessWebsiteList; + WebsiteListType = &BusinessWebsiteListType; + WebsiteListAltID = &BusinessWebsiteListAltID; + WebsiteListPID = &BusinessWebsiteListPID; + WebsiteListTokens = &BusinessWebsiteListTokens; + WebsiteListMediatype = &BusinessWebsiteListMediatype; + WebsiteListPref = &BusinessWebsiteListPref; + break; + } + + intPrevValue = 4; + + for (std::map::iterator intiter = SplitPoints.begin(); + intiter != SplitPoints.end(); ++intiter){ + + SLiter = SplitLength.find(intiter->first); + + PropertyData = PropertySeg1.Mid(intPrevValue, (SLiter->second)); + + wxStringTokenizer PropertyElement (PropertyData, wxT("=")); + PropertyName = PropertyElement.GetNextToken(); + PropertyValue = PropertyElement.GetNextToken(); + + intPrevValue = intiter->second; + + // Process properties. + + size_t intPropertyValueLen = PropertyValue.Len(); + + if (PropertyValue.Mid((intPropertyValueLen - 1), 1) == wxT("\"")){ + + PropertyValue.Trim(); + PropertyValue.RemoveLast(); + + } + + if (PropertyValue.Mid(0, 1) == wxT("\"")){ + + PropertyValue.Remove(0, 1); + + } + + CaptureString(&PropertyValue, FALSE); + + if (PropertyName == wxT("ALTID")){ + + WebsiteListAltID->erase(*URLCount); + WebsiteListAltID->insert(std::make_pair(*URLCount, PropertyValue)); + + } else if (PropertyName == wxT("PID")){ + + WebsiteListPID->erase(*URLCount); + WebsiteListPID->insert(std::make_pair(*URLCount, PropertyValue)); + + } else if (PropertyName == wxT("PREF")){ + + ProcessIntegerValue(WebsiteListPref, &PropertyValue, URLCount); + + } else if (PropertyName == wxT("MEDIATYPE")){ + + WebsiteListMediatype->erase(*URLCount); + WebsiteListMediatype->insert(std::make_pair(*URLCount, PropertyValue)); + + } else { + + // Something else we don't know about so append + // to the tokens variable. + + if (!PropertyName.IsEmpty() && !PropertyValue.IsEmpty() && PropertyName != wxT("TYPE")){ + + if (FirstToken == TRUE){ + + PropertyTokens.Append(PropertyName + wxT("=") + PropertyValue); + FirstToken = FALSE; + + } else { + + PropertyTokens.Append(wxT(";") + PropertyName + wxT("=") + PropertyValue); + + } + + } + + } + + } + + // Add the data to the General/Home/Work address variables. + + CaptureString(&PropertySeg2, FALSE); + + WebsiteList->insert(std::make_pair(*URLCount, PropertySeg2)); + + if (!PropertyTokens.IsEmpty()){ + + WebsiteListTokens->insert(std::make_pair(*URLCount, PropertyTokens)); + + } + +} + +void ContactDataObject::ProcessTitle(wxString PropertySeg1, wxString PropertySeg2, int *TitleCount){ + + std::map SplitPoints; + std::map SplitLength; + std::map::iterator SLiter; + wxString PropertyData; + wxString PropertyName; + wxString PropertyValue; + wxString PropertyTokens; + bool FirstToken = TRUE; + int intPrevValue = 7; + int intPref = 0; + int intType = 0; + long ListCtrlIndex; + + SplitValues(&PropertySeg1, &SplitPoints, &SplitLength, intPrevValue); + + intPrevValue = 6; + + PropertyType PropType = PROPERTY_NONE; + + // Look for type before continuing. + + CheckType(&PropertySeg1, &SplitPoints, &SplitLength, &intPrevValue, &PropType); + + // Setup the pointers. + + std::map *TitleList = NULL; + std::map *TitleListAltID = NULL; + std::map *TitleListPID = NULL; + std::map *TitleListType = NULL; + std::map *TitleListTokens = NULL; + std::map *TitleListLanguage = NULL; + std::map *TitleListPref = NULL; + + // Setup blank lines for later on. + + switch(PropType){ + case PROPERTY_NONE: + TitleList = &GeneralTitleList; + TitleListType = &GeneralTitleListType; + TitleListAltID = &GeneralTitleListAltID; + TitleListPID = &GeneralTitleListPID; + TitleListTokens = &GeneralTitleListTokens; + TitleListLanguage = &GeneralTitleListLanguage; + TitleListPref = &GeneralTitleListPref; + break; + case PROPERTY_HOME: + TitleList = &HomeTitleList; + TitleListType = &HomeTitleListType; + TitleListAltID = &HomeTitleListAltID; + TitleListPID = &HomeTitleListPID; + TitleListTokens = &HomeTitleListTokens; + TitleListLanguage = &HomeTitleListLanguage; + TitleListPref = &HomeTitleListPref; + break; + case PROPERTY_WORK: + TitleList = &BusinessTitleList; + TitleListType = &BusinessTitleListType; + TitleListAltID = &BusinessTitleListAltID; + TitleListPID = &BusinessTitleListPID; + TitleListTokens = &BusinessTitleListTokens; + TitleListLanguage = &BusinessTitleListLanguage; + TitleListPref = &BusinessTitleListPref; + break; + } + + intPrevValue = 6; + + for (std::map::iterator intiter = SplitPoints.begin(); + intiter != SplitPoints.end(); ++intiter){ + + SLiter = SplitLength.find(intiter->first); + + PropertyData = PropertySeg1.Mid(intPrevValue, (SLiter->second)); + + wxStringTokenizer PropertyElement (PropertyData, wxT("=")); + PropertyName = PropertyElement.GetNextToken(); + PropertyValue = PropertyElement.GetNextToken(); + + intPrevValue = intiter->second; + + // Process properties. + + size_t intPropertyValueLen = PropertyValue.Len(); + + if (PropertyValue.Mid((intPropertyValueLen - 1), 1) == wxT("\"")){ + + PropertyValue.Trim(); + PropertyValue.RemoveLast(); + + } + + if (PropertyValue.Mid(0, 1) == wxT("\"")){ + + PropertyValue.Remove(0, 1); + + } + + CaptureString(&PropertyValue, FALSE); + + if (PropertyName == wxT("ALTID")){ + + TitleListAltID->erase(*TitleCount); + TitleListAltID->insert(std::make_pair(*TitleCount, PropertyValue)); + + } else if (PropertyName == wxT("PID")){ + + TitleListPID->erase(*TitleCount); + TitleListPID->insert(std::make_pair(*TitleCount, PropertyValue)); + + } else if (PropertyName == wxT("PREF")){ + + ProcessIntegerValue(TitleListPref, &PropertyValue, TitleCount); + + } else if (PropertyName == wxT("LANGUAGE")){ + + TitleListLanguage->erase(*TitleCount); + TitleListLanguage->insert(std::make_pair(*TitleCount, PropertyValue)); + + } else { + + // Something else we don't know about so append + // to the tokens variable. + + if (!PropertyName.IsEmpty() && !PropertyValue.IsEmpty() && PropertyName != wxT("TYPE")){ + + if (FirstToken == TRUE){ + + PropertyTokens.Append(PropertyName + wxT("=") + PropertyValue); + FirstToken = FALSE; + + } else { + + PropertyTokens.Append(wxT(";") + PropertyName + wxT("=") + PropertyValue); + + } + + } + + } + + } + + // Add the data to the General/Home/Work address variables. + + CaptureString(&PropertySeg2, FALSE); + + TitleList->insert(std::make_pair(*TitleCount, PropertySeg2)); + + if (!PropertyTokens.IsEmpty()){ + + TitleListTokens->insert(std::make_pair(*TitleCount, PropertyTokens)); + + } + +} + +void ContactDataObject::ProcessRole(wxString PropertySeg1, wxString PropertySeg2, int *RoleCount){ + + std::map SplitPoints; + std::map SplitLength; + std::map::iterator SLiter; + wxString PropertyData; + wxString PropertyName; + wxString PropertyValue; + wxString PropertyTokens; + bool FirstToken = TRUE; + int intPrevValue = 6; + int intPref = 0; + int intType = 0; + long ListCtrlIndex; + + SplitValues(&PropertySeg1, &SplitPoints, &SplitLength, intPrevValue); + + intPrevValue = 5; + + PropertyType PropType = PROPERTY_NONE; + + // Look for type before continuing. + + CheckType(&PropertySeg1, &SplitPoints, &SplitLength, &intPrevValue, &PropType); + + // Setup the pointers. + + std::map *RoleList = NULL; + std::map *RoleListAltID = NULL; + std::map *RoleListPID = NULL; + std::map *RoleListType = NULL; + std::map *RoleListTokens = NULL; + std::map *RoleListLanguage = NULL; + std::map *RoleListPref = NULL; + + // Setup blank lines for later on. + + switch(PropType){ + case PROPERTY_NONE: + RoleList = &GeneralRoleList; + RoleListType = &GeneralRoleListType; + RoleListAltID = &GeneralRoleListAltID; + RoleListPID = &GeneralRoleListPID; + RoleListTokens = &GeneralRoleListTokens; + RoleListLanguage = &GeneralRoleListLanguage; + RoleListPref = &GeneralRoleListPref; + break; + case PROPERTY_HOME: + RoleList = &HomeRoleList; + RoleListType = &HomeRoleListType; + RoleListAltID = &HomeRoleListAltID; + RoleListPID = &HomeRoleListPID; + RoleListTokens = &HomeRoleListTokens; + RoleListLanguage = &HomeRoleListLanguage; + RoleListPref = &HomeRoleListPref; + break; + case PROPERTY_WORK: + RoleList = &BusinessRoleList; + RoleListType = &BusinessRoleListType; + RoleListAltID = &BusinessRoleListAltID; + RoleListPID = &BusinessRoleListPID; + RoleListTokens = &BusinessRoleListTokens; + RoleListLanguage = &BusinessRoleListLanguage; + RoleListPref = &BusinessRoleListPref; break; } - - intPrevValue = 4; - + + intPrevValue = 5; + for (std::map::iterator intiter = SplitPoints.begin(); intiter != SplitPoints.end(); ++intiter){ @@ -2993,44 +3547,28 @@ void ContactDataObject::ProcessURL(wxString PropertySeg1, wxString PropertySeg2, PropertyValue.Remove(0, 1); - } + } CaptureString(&PropertyValue, FALSE); if (PropertyName == wxT("ALTID")){ - - WebsiteListAltID->erase(*URLCount); - WebsiteListAltID->insert(std::make_pair(*URLCount, PropertyValue)); + + RoleListAltID->erase(*RoleCount); + RoleListAltID->insert(std::make_pair(*RoleCount, PropertyValue)); } else if (PropertyName == wxT("PID")){ - WebsiteListPID->erase(*URLCount); - WebsiteListPID->insert(std::make_pair(*URLCount, PropertyValue)); - + RoleListPID->erase(*RoleCount); + RoleListPID->insert(std::make_pair(*RoleCount, 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")){ + ProcessIntegerValue(RoleListPref, &PropertyValue, RoleCount); + + } else if (PropertyName == wxT("LANGUAGE")){ - WebsiteListMediatype->erase(*URLCount); - WebsiteListMediatype->insert(std::make_pair(*URLCount, PropertyValue)); + RoleListLanguage->erase(*RoleCount); + RoleListLanguage->insert(std::make_pair(*RoleCount, PropertyValue)); } else { @@ -3059,18 +3597,18 @@ void ContactDataObject::ProcessURL(wxString PropertySeg1, wxString PropertySeg2, // Add the data to the General/Home/Work address variables. CaptureString(&PropertySeg2, FALSE); - - WebsiteList->insert(std::make_pair(*URLCount, PropertySeg2)); + + RoleList->insert(std::make_pair(*RoleCount, PropertySeg2)); if (!PropertyTokens.IsEmpty()){ - WebsiteListTokens->insert(std::make_pair(*URLCount, PropertyTokens)); + RoleListTokens->insert(std::make_pair(*RoleCount, PropertyTokens)); } - + } -void ContactDataObject::ProcessTitle(wxString PropertySeg1, wxString PropertySeg2, int *TitleCount){ +void ContactDataObject::ProcessOrganisation(wxString PropertySeg1, wxString PropertySeg2, int *OrganisationCount){ std::map SplitPoints; std::map SplitLength; @@ -3080,14 +3618,14 @@ void ContactDataObject::ProcessTitle(wxString PropertySeg1, wxString PropertySeg wxString PropertyValue; wxString PropertyTokens; bool FirstToken = TRUE; - int intPrevValue = 7; + int intPrevValue = 5; int intPref = 0; int intType = 0; long ListCtrlIndex; SplitValues(&PropertySeg1, &SplitPoints, &SplitLength, intPrevValue); - intPrevValue = 6; + intPrevValue = 4; PropertyType PropType = PROPERTY_NONE; @@ -3097,47 +3635,51 @@ void ContactDataObject::ProcessTitle(wxString PropertySeg1, wxString PropertySeg // Setup the pointers. - std::map *TitleList = NULL; - std::map *TitleListAltID = NULL; - std::map *TitleListPID = NULL; - std::map *TitleListType = NULL; - std::map *TitleListTokens = NULL; - std::map *TitleListLanguage = NULL; - std::map *TitleListPref = NULL; + std::map *OrganisationsList = NULL; + std::map *OrganisationsListAltID = NULL; + std::map *OrganisationsListPID = NULL; + std::map *OrganisationsListType = NULL; + std::map *OrganisationsListTokens = NULL; + std::map *OrganisationsListLanguage = NULL; + std::map *OrganisationsListSortAs = NULL; + std::map *OrganisationsListPref = NULL; // Setup blank lines for later on. switch(PropType){ case PROPERTY_NONE: - TitleList = &GeneralTitleList; - TitleListType = &GeneralTitleListType; - TitleListAltID = &GeneralTitleListAltID; - TitleListPID = &GeneralTitleListPID; - TitleListTokens = &GeneralTitleListTokens; - TitleListLanguage = &GeneralTitleListLanguage; - TitleListPref = &GeneralTitleListPref; + OrganisationsList = &GeneralOrganisationsList; + OrganisationsListType = &GeneralOrganisationsListType; + OrganisationsListAltID = &GeneralOrganisationsListAltID; + OrganisationsListPID = &GeneralOrganisationsListPID; + OrganisationsListTokens = &GeneralOrganisationsListTokens; + OrganisationsListLanguage = &GeneralOrganisationsListLanguage; + OrganisationsListSortAs = &GeneralOrganisationsListSortAs; + OrganisationsListPref = &GeneralOrganisationsListPref; break; case PROPERTY_HOME: - TitleList = &HomeTitleList; - TitleListType = &HomeTitleListType; - TitleListAltID = &HomeTitleListAltID; - TitleListPID = &HomeTitleListPID; - TitleListTokens = &HomeTitleListTokens; - TitleListLanguage = &HomeTitleListLanguage; - TitleListPref = &HomeTitleListPref; + OrganisationsList = &HomeOrganisationsList; + OrganisationsListType = &HomeOrganisationsListType; + OrganisationsListAltID = &HomeOrganisationsListAltID; + OrganisationsListPID = &HomeOrganisationsListPID; + OrganisationsListTokens = &HomeOrganisationsListTokens; + OrganisationsListLanguage = &HomeOrganisationsListLanguage; + OrganisationsListSortAs = &HomeOrganisationsListSortAs; + OrganisationsListPref = &HomeOrganisationsListPref; break; case PROPERTY_WORK: - TitleList = &BusinessTitleList; - TitleListType = &BusinessTitleListType; - TitleListAltID = &BusinessTitleListAltID; - TitleListPID = &BusinessTitleListPID; - TitleListTokens = &BusinessTitleListTokens; - TitleListLanguage = &BusinessTitleListLanguage; - TitleListPref = &BusinessTitleListPref; + OrganisationsList = &BusinessOrganisationsList; + OrganisationsListType = &BusinessOrganisationsListType; + OrganisationsListAltID = &BusinessOrganisationsListAltID; + OrganisationsListPID = &BusinessOrganisationsListPID; + OrganisationsListTokens = &BusinessOrganisationsListTokens; + OrganisationsListLanguage = &BusinessOrganisationsListLanguage; + OrganisationsListSortAs = &BusinessOrganisationsListSortAs; + OrganisationsListPref = &BusinessOrganisationsListPref; break; } - intPrevValue = 6; + intPrevValue = 4; for (std::map::iterator intiter = SplitPoints.begin(); intiter != SplitPoints.end(); ++intiter){ @@ -3173,38 +3715,27 @@ void ContactDataObject::ProcessTitle(wxString PropertySeg1, wxString PropertySeg if (PropertyName == wxT("ALTID")){ - TitleListAltID->erase(*TitleCount); - TitleListAltID->insert(std::make_pair(*TitleCount, PropertyValue)); + OrganisationsListAltID->erase(*OrganisationCount); + OrganisationsListAltID->insert(std::make_pair(*OrganisationCount, PropertyValue)); } else if (PropertyName == wxT("PID")){ - TitleListPID->erase(*TitleCount); - TitleListPID->insert(std::make_pair(*TitleCount, PropertyValue)); + OrganisationsListPID->erase(*OrganisationCount); + OrganisationsListPID->insert(std::make_pair(*OrganisationCount, 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){ + } else if (PropertyName == wxT("SORT-AS")){ - TitleListPref->erase(*TitleCount); - TitleListPref->insert(std::make_pair(*TitleCount, PriorityNumber)); + OrganisationsListSortAs->erase(*OrganisationCount); + OrganisationsListSortAs->insert(std::make_pair(*OrganisationCount, PropertyValue)); + + } else if (PropertyName == wxT("PREF")){ - } - + ProcessIntegerValue(OrganisationsListPref, &PropertyValue, OrganisationCount); + } else if (PropertyName == wxT("LANGUAGE")){ - TitleListLanguage->erase(*TitleCount); - TitleListLanguage->insert(std::make_pair(*TitleCount, PropertyValue)); + OrganisationsListLanguage->erase(*OrganisationCount); + OrganisationsListLanguage->insert(std::make_pair(*OrganisationCount, PropertyValue)); } else { @@ -3234,17 +3765,17 @@ void ContactDataObject::ProcessTitle(wxString PropertySeg1, wxString PropertySeg CaptureString(&PropertySeg2, FALSE); - TitleList->insert(std::make_pair(*TitleCount, PropertySeg2)); + OrganisationsList->insert(std::make_pair(*OrganisationCount, PropertySeg2)); if (!PropertyTokens.IsEmpty()){ - TitleListTokens->insert(std::make_pair(*TitleCount, PropertyTokens)); + OrganisationsListTokens->insert(std::make_pair(*OrganisationCount, PropertyTokens)); } } -void ContactDataObject::ProcessRole(wxString PropertySeg1, wxString PropertySeg2, int *RoleCount){ +void ContactDataObject::ProcessNote(wxString PropertySeg1, wxString PropertySeg2, int *NoteCount){ std::map SplitPoints; std::map SplitLength; @@ -3271,43 +3802,43 @@ void ContactDataObject::ProcessRole(wxString PropertySeg1, wxString PropertySeg2 // Setup the pointers. - std::map *RoleList = NULL; - std::map *RoleListAltID = NULL; - std::map *RoleListPID = NULL; - std::map *RoleListType = NULL; - std::map *RoleListTokens = NULL; - std::map *RoleListLanguage = NULL; - std::map *RoleListPref = NULL; + std::map *NoteList = NULL; + std::map *NoteListAltID = NULL; + std::map *NoteListPID = NULL; + std::map *NoteListType = NULL; + std::map *NoteListTokens = NULL; + std::map *NoteListLanguage = NULL; + std::map *NoteListPref = NULL; // Setup blank lines for later on. switch(PropType){ case PROPERTY_NONE: - RoleList = &GeneralRoleList; - RoleListType = &GeneralRoleListType; - RoleListAltID = &GeneralRoleListAltID; - RoleListPID = &GeneralRoleListPID; - RoleListTokens = &GeneralRoleListTokens; - RoleListLanguage = &GeneralRoleListLanguage; - RoleListPref = &GeneralRoleListPref; + NoteList = &GeneralNoteList; + NoteListType = &GeneralNoteListType; + NoteListAltID = &GeneralNoteListAltID; + NoteListPID = &GeneralNoteListPID; + NoteListTokens = &GeneralNoteListTokens; + NoteListLanguage = &GeneralNoteListLanguage; + NoteListPref = &GeneralNoteListPref; break; case PROPERTY_HOME: - RoleList = &HomeRoleList; - RoleListType = &HomeRoleListType; - RoleListAltID = &HomeRoleListAltID; - RoleListPID = &HomeRoleListPID; - RoleListTokens = &HomeRoleListTokens; - RoleListLanguage = &HomeRoleListLanguage; - RoleListPref = &HomeRoleListPref; + NoteList = &HomeNoteList; + NoteListType = &HomeNoteListType; + NoteListAltID = &HomeNoteListAltID; + NoteListPID = &HomeNoteListPID; + NoteListTokens = &HomeNoteListTokens; + NoteListLanguage = &HomeNoteListLanguage; + NoteListPref = &HomeNoteListPref; break; case PROPERTY_WORK: - RoleList = &BusinessRoleList; - RoleListType = &BusinessRoleListType; - RoleListAltID = &BusinessRoleListAltID; - RoleListPID = &BusinessRoleListPID; - RoleListTokens = &BusinessRoleListTokens; - RoleListLanguage = &BusinessRoleListLanguage; - RoleListPref = &BusinessRoleListPref; + NoteList = &BusinessNoteList; + NoteListType = &BusinessNoteListType; + NoteListAltID = &BusinessNoteListAltID; + NoteListPID = &BusinessNoteListPID; + NoteListTokens = &BusinessNoteListTokens; + NoteListLanguage = &BusinessNoteListLanguage; + NoteListPref = &BusinessNoteListPref; break; } @@ -3347,38 +3878,22 @@ void ContactDataObject::ProcessRole(wxString PropertySeg1, wxString PropertySeg2 if (PropertyName == wxT("ALTID")){ - RoleListAltID->erase(*RoleCount); - RoleListAltID->insert(std::make_pair(*RoleCount, PropertyValue)); + NoteListAltID->erase(*NoteCount); + NoteListAltID->insert(std::make_pair(*NoteCount, PropertyValue)); } else if (PropertyName == wxT("PID")){ - RoleListPID->erase(*RoleCount); - RoleListPID->insert(std::make_pair(*RoleCount, 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){ - - RoleListPref->erase(*RoleCount); - RoleListPref->insert(std::make_pair(*RoleCount, PriorityNumber)); + NoteListPID->erase(*NoteCount); + NoteListPID->insert(std::make_pair(*NoteCount, PropertyValue)); + + } else if (PropertyName == wxT("PREF")){ - } - + ProcessIntegerValue(NoteListPref, &PropertyValue, NoteCount); + } else if (PropertyName == wxT("LANGUAGE")){ - RoleListLanguage->erase(*RoleCount); - RoleListLanguage->insert(std::make_pair(*RoleCount, PropertyValue)); + NoteListLanguage->erase(*NoteCount); + NoteListLanguage->insert(std::make_pair(*NoteCount, PropertyValue)); } else { @@ -3408,17 +3923,17 @@ void ContactDataObject::ProcessRole(wxString PropertySeg1, wxString PropertySeg2 CaptureString(&PropertySeg2, FALSE); - RoleList->insert(std::make_pair(*RoleCount, PropertySeg2)); + NoteList->insert(std::make_pair(*NoteCount, PropertySeg2)); if (!PropertyTokens.IsEmpty()){ - RoleListTokens->insert(std::make_pair(*RoleCount, PropertyTokens)); + NoteListTokens->insert(std::make_pair(*NoteCount, PropertyTokens)); } } -void ContactDataObject::ProcessOrganisation(wxString PropertySeg1, wxString PropertySeg2, int *OrganisationCount){ +void ContactDataObject::ProcessCategory(wxString PropertySeg1, wxString PropertySeg2, int *CategoryCount){ std::map SplitPoints; std::map SplitLength; @@ -3428,14 +3943,14 @@ void ContactDataObject::ProcessOrganisation(wxString PropertySeg1, wxString Prop wxString PropertyValue; wxString PropertyTokens; bool FirstToken = TRUE; - int intPrevValue = 5; + int intPrevValue = 12; int intPref = 0; int intType = 0; long ListCtrlIndex; SplitValues(&PropertySeg1, &SplitPoints, &SplitLength, intPrevValue); - intPrevValue = 4; + intPrevValue = 11; PropertyType PropType = PROPERTY_NONE; @@ -3443,53 +3958,20 @@ void ContactDataObject::ProcessOrganisation(wxString PropertySeg1, wxString Prop CheckType(&PropertySeg1, &SplitPoints, &SplitLength, &intPrevValue, &PropType); - // Setup the pointers. - - std::map *OrganisationsList = NULL; - std::map *OrganisationsListAltID = NULL; - std::map *OrganisationsListPID = NULL; - std::map *OrganisationsListType = NULL; - std::map *OrganisationsListTokens = NULL; - std::map *OrganisationsListLanguage = NULL; - std::map *OrganisationsListSortAs = NULL; - std::map *OrganisationsListPref = NULL; - // Setup blank lines for later on. switch(PropType){ case PROPERTY_NONE: - OrganisationsList = &GeneralOrganisationsList; - OrganisationsListType = &GeneralOrganisationsListType; - OrganisationsListAltID = &GeneralOrganisationsListAltID; - OrganisationsListPID = &GeneralOrganisationsListPID; - OrganisationsListTokens = &GeneralOrganisationsListTokens; - OrganisationsListLanguage = &GeneralOrganisationsListLanguage; - OrganisationsListSortAs = &GeneralOrganisationsListSortAs; - OrganisationsListPref = &GeneralOrganisationsListPref; break; case PROPERTY_HOME: - OrganisationsList = &HomeOrganisationsList; - OrganisationsListType = &HomeOrganisationsListType; - OrganisationsListAltID = &HomeOrganisationsListAltID; - OrganisationsListPID = &HomeOrganisationsListPID; - OrganisationsListTokens = &HomeOrganisationsListTokens; - OrganisationsListLanguage = &HomeOrganisationsListLanguage; - OrganisationsListSortAs = &HomeOrganisationsListSortAs; - OrganisationsListPref = &HomeOrganisationsListPref; + CategoriesListType.insert(std::make_pair(*CategoryCount, "home")); break; case PROPERTY_WORK: - OrganisationsList = &BusinessOrganisationsList; - OrganisationsListType = &BusinessOrganisationsListType; - OrganisationsListAltID = &BusinessOrganisationsListAltID; - OrganisationsListPID = &BusinessOrganisationsListPID; - OrganisationsListTokens = &BusinessOrganisationsListTokens; - OrganisationsListLanguage = &BusinessOrganisationsListLanguage; - OrganisationsListSortAs = &BusinessOrganisationsListSortAs; - OrganisationsListPref = &BusinessOrganisationsListPref; + CategoriesListType.insert(std::make_pair(*CategoryCount, "work")); break; } - intPrevValue = 4; + intPrevValue = 11; for (std::map::iterator intiter = SplitPoints.begin(); intiter != SplitPoints.end(); ++intiter){ @@ -3525,43 +4007,22 @@ void ContactDataObject::ProcessOrganisation(wxString PropertySeg1, wxString Prop if (PropertyName == wxT("ALTID")){ - OrganisationsListAltID->erase(*OrganisationCount); - OrganisationsListAltID->insert(std::make_pair(*OrganisationCount, PropertyValue)); + CategoriesListAltID.erase(*CategoryCount); + CategoriesListAltID.insert(std::make_pair(*CategoryCount, PropertyValue)); } else if (PropertyName == wxT("PID")){ - OrganisationsListPID->erase(*OrganisationCount); - OrganisationsListPID->insert(std::make_pair(*OrganisationCount, PropertyValue)); - - } else if (PropertyName == wxT("SORT-AS")){ - - OrganisationsListSortAs->erase(*OrganisationCount); - OrganisationsListSortAs->insert(std::make_pair(*OrganisationCount, PropertyValue)); + CategoriesListPID.erase(*CategoryCount); + CategoriesListPID.insert(std::make_pair(*CategoryCount, 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){ - OrganisationsListPref->erase(*OrganisationCount); - OrganisationsListPref->insert(std::make_pair(*OrganisationCount, PriorityNumber)); - - } - + ProcessIntegerValue(&CategoriesListPref, &PropertyValue, CategoryCount); + } else if (PropertyName == wxT("LANGUAGE")){ - OrganisationsListLanguage->erase(*OrganisationCount); - OrganisationsListLanguage->insert(std::make_pair(*OrganisationCount, PropertyValue)); + CategoriesListLanguage.erase(*CategoryCount); + CategoriesListLanguage.insert(std::make_pair(*CategoryCount, PropertyValue)); } else { @@ -3587,22 +4048,178 @@ void ContactDataObject::ProcessOrganisation(wxString PropertySeg1, wxString Prop } - // Add the data to the General/Home/Work address variables. + // Deal with multiple categories. - CaptureString(&PropertySeg2, FALSE); + int intOrigCatCount = *CategoryCount; + bool FirstCategoryProcessed = TRUE; + bool AfterFirstToken = FALSE; + int intSplitSize = 0; + int intSplitsFound = 0; + int intSplitSeek = 0; + int intPropertyLen = PropertySeg2.Len(); + + SplitPoints.clear(); + SplitLength.clear(); + intPrevValue = 0; + + for (int i = 0; i <= intPropertyLen; i++){ + + if (intSplitSize == 0 && PropertySeg2.Mid(i, 1) == wxT(" ")){ + + continue; + + } + + intSplitSize++; + + if (PropertySeg2.Mid(i, 1) == wxT(",") && PropertySeg2.Mid((i - 1), 1) != wxT("\\")){ + + if (AfterFirstToken == TRUE){ + + SplitPoints.insert(std::make_pair(intSplitsFound, (i - intSplitSize + 1))); + SplitLength.insert(std::make_pair(intSplitsFound, (intSplitSize - 2))); + + } else { + + SplitPoints.insert(std::make_pair(intSplitsFound, 0)); + SplitLength.insert(std::make_pair(intSplitsFound, (intSplitSize - 2))); + AfterFirstToken = TRUE; - OrganisationsList->insert(std::make_pair(*OrganisationCount, PropertySeg2)); + } + + intSplitsFound++; + intSplitSeek = i; + intSplitSize = 0; - if (!PropertyTokens.IsEmpty()){ + } - OrganisationsListTokens->insert(std::make_pair(*OrganisationCount, PropertyTokens)); + } + + if (SplitPoints.size() > 0){ + + SplitPoints.insert(std::make_pair(intSplitsFound, (intSplitSeek + 1))); + SplitLength.insert(std::make_pair(intSplitsFound, intSplitSize)); + + } + + if (SplitPoints.size() == 0){ + + CategoriesList.insert(std::make_pair(*CategoryCount, PropertySeg2)); + + if (!PropertyTokens.IsEmpty()){ + + CategoriesListTokens.insert(std::make_pair(*CategoryCount, PropertyTokens)); + + } + + } + + for (std::map::iterator intiter = SplitPoints.begin(); + intiter != SplitPoints.end(); ++intiter){ + + SLiter = SplitLength.find(intiter->first); + + intPrevValue = intiter->second; + + PropertyData = PropertySeg2.Mid(intPrevValue, (SLiter->second + 1)); + + // Add the data to the General/Home/Work address variables. + + // Trim any whitespace from the start and end. + + PropertyData = PropertyData.Trim(FALSE); + PropertyData = PropertyData.Trim(TRUE); + + CaptureString(&PropertyData, FALSE); + + if (FirstCategoryProcessed == TRUE){ + + FirstCategoryProcessed = FALSE; + + CategoriesList.insert(std::make_pair(*CategoryCount, PropertyData)); + + if (!PropertyTokens.IsEmpty()){ + + CategoriesListTokens.insert(std::make_pair(*CategoryCount, PropertyTokens)); + + } + + continue; + + } else { + + (*CategoryCount)++; + CategoriesList.insert(std::make_pair(*CategoryCount, PropertyData)); + + if (!PropertyTokens.IsEmpty()){ + + CategoriesListTokens.insert(std::make_pair(*CategoryCount, PropertyTokens)); + + } + + } + + // Copy the properties to each of the categories (if it exists). + + if (!PropertyTokens.IsEmpty()){ + + CategoriesListTokens.insert(std::make_pair(*CategoryCount, CategoriesListTokens.find(intOrigCatCount)->second)); + + } + + // Check if ALTID was used. + + if (CategoriesListAltID.find(intOrigCatCount) != CategoriesListAltID.end()){ + + CategoriesListAltID.insert(std::make_pair(*CategoryCount, CategoriesListAltID.find(intOrigCatCount)->second)); + + } + + // Check if PID was used. + + if (CategoriesListPID.find(intOrigCatCount) != CategoriesListPID.end()){ + + CategoriesListPID.insert(std::make_pair(*CategoryCount, CategoriesListPID.find(intOrigCatCount)->second)); + + } + + // Check if PREF was used. + + if (CategoriesListPref.find(intOrigCatCount) != CategoriesListPref.end()){ + + CategoriesListPref.insert(std::make_pair(*CategoryCount, CategoriesListPref.find(intOrigCatCount)->second)); + + } + + // Check if LANGUAGE was used. + + if (CategoriesListLanguage.find(intOrigCatCount) != CategoriesListLanguage.end()){ + + CategoriesListLanguage.insert(std::make_pair(*CategoryCount, CategoriesListLanguage.find(intOrigCatCount)->second)); + + } + + // Check if TYPE was used. + + switch(PropType){ + case PROPERTY_NONE: + break; + case PROPERTY_HOME: + CategoriesListType.insert(std::make_pair(*CategoryCount, "home")); + break; + case PROPERTY_WORK: + CategoriesListType.insert(std::make_pair(*CategoryCount, "work")); + break; + } + } } -void ContactDataObject::ProcessNote(wxString PropertySeg1, wxString PropertySeg2, int *NoteCount){ +void ContactDataObject::ProcessPhoto(wxString PropertySeg1, wxString PropertySeg2, int *PhotoCount){ + size_t intPropertyLen = PropertySeg1.Len(); std::map SplitPoints; std::map SplitLength; std::map::iterator SLiter; @@ -3611,65 +4228,24 @@ void ContactDataObject::ProcessNote(wxString PropertySeg1, wxString PropertySeg2 wxString PropertyValue; wxString PropertyTokens; bool FirstToken = TRUE; - int intPrevValue = 6; + int intSplitsFound = 0; + int intSplitSize = 0; + int intPrevValue = 7; int intPref = 0; int intType = 0; - long ListCtrlIndex; SplitValues(&PropertySeg1, &SplitPoints, &SplitLength, intPrevValue); - intPrevValue = 5; + intPrevValue = 6; PropertyType PropType = PROPERTY_NONE; // Look for type before continuing. CheckType(&PropertySeg1, &SplitPoints, &SplitLength, &intPrevValue, &PropType); - - // Setup the pointers. - - std::map *NoteList = NULL; - std::map *NoteListAltID = NULL; - std::map *NoteListPID = NULL; - std::map *NoteListType = NULL; - std::map *NoteListTokens = NULL; - std::map *NoteListLanguage = NULL; - std::map *NoteListPref = NULL; - - // Setup blank lines for later on. - - switch(PropType){ - case PROPERTY_NONE: - NoteList = &GeneralNoteList; - NoteListType = &GeneralNoteListType; - NoteListAltID = &GeneralNoteListAltID; - NoteListPID = &GeneralNoteListPID; - NoteListTokens = &GeneralNoteListTokens; - NoteListLanguage = &GeneralNoteListLanguage; - NoteListPref = &GeneralNoteListPref; - break; - case PROPERTY_HOME: - NoteList = &HomeNoteList; - NoteListType = &HomeNoteListType; - NoteListAltID = &HomeNoteListAltID; - NoteListPID = &HomeNoteListPID; - NoteListTokens = &HomeNoteListTokens; - NoteListLanguage = &HomeNoteListLanguage; - NoteListPref = &HomeNoteListPref; - break; - case PROPERTY_WORK: - NoteList = &BusinessNoteList; - NoteListType = &BusinessNoteListType; - NoteListAltID = &BusinessNoteListAltID; - NoteListPID = &BusinessNoteListPID; - NoteListTokens = &BusinessNoteListTokens; - NoteListLanguage = &BusinessNoteListLanguage; - NoteListPref = &BusinessNoteListPref; - break; - } - intPrevValue = 5; - + intPrevValue = 6; + for (std::map::iterator intiter = SplitPoints.begin(); intiter != SplitPoints.end(); ++intiter){ @@ -3698,64 +4274,120 @@ void ContactDataObject::ProcessNote(wxString PropertySeg1, wxString PropertySeg2 PropertyValue.Remove(0, 1); - } + } CaptureString(&PropertyValue, FALSE); if (PropertyName == wxT("ALTID")){ - - NoteListAltID->erase(*NoteCount); - NoteListAltID->insert(std::make_pair(*NoteCount, PropertyValue)); + + PicturesListAltID.erase(*PhotoCount); + PicturesListAltID.insert(std::make_pair(*PhotoCount, PropertyValue)); } else if (PropertyName == wxT("PID")){ - NoteListPID->erase(*NoteCount); - NoteListPID->insert(std::make_pair(*NoteCount, PropertyValue)); + PicturesListPID.erase(*PhotoCount); + PicturesListPID.insert(std::make_pair(*PhotoCount, 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){ - - NoteListPref->erase(*NoteCount); - NoteListPref->insert(std::make_pair(*NoteCount, PriorityNumber)); - - } - - } else if (PropertyName == wxT("LANGUAGE")){ + ProcessIntegerValue(&PicturesListPref, &PropertyValue, PhotoCount); - NoteListLanguage->erase(*NoteCount); - NoteListLanguage->insert(std::make_pair(*NoteCount, PropertyValue)); + } else if (PropertyName == wxT("MEDIATYPE")){ + PicturesListMediatype.erase(*PhotoCount); + PicturesListMediatype.insert(std::make_pair(*PhotoCount, PropertyValue)); + } else { // Something else we don't know about so append // to the tokens variable. - + if (!PropertyName.IsEmpty() && !PropertyValue.IsEmpty() && PropertyName != wxT("TYPE")){ - - if (FirstToken == TRUE){ + if (FirstToken == TRUE){ + PropertyTokens.Append(PropertyName + wxT("=") + PropertyValue); FirstToken = FALSE; - + } else { - + PropertyTokens.Append(wxT(";") + PropertyName + wxT("=") + PropertyValue); - + } + + } + } + + } + + intPropertyLen = PropertySeg2.Len(); + SplitPoints.clear(); + SplitLength.clear(); + intSplitsFound = 0; + intSplitSize = 0; + intPrevValue = 0; + + CaptureString(&PropertySeg2, FALSE); + + for (int i = 0; i <= intPropertyLen; i++){ + + intSplitSize++; + + if (PropertySeg2.Mid(i, 1) == wxT(";")){ + + intSplitsFound++; + SplitPoints.insert(std::make_pair(intSplitsFound, (i + 1))); + + if (intSplitsFound == 6){ + + SplitLength.insert(std::make_pair(intSplitsFound, (intSplitSize - 1))); + break; + + } else { + + SplitLength.insert(std::make_pair(intSplitsFound, (intSplitSize - 1))); + } + + intSplitSize = 0; + + } + + } + + wxString wxSPhotoURI; + wxString wxSPhotoMIME; + wxString wxSPhotoEncoding; + wxString wxSPhotoData; + std::string base64enc; + + if (intSplitsFound == 0){ + + } else { + + std::map::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; } @@ -3763,20 +4395,32 @@ void ContactDataObject::ProcessNote(wxString PropertySeg1, wxString PropertySeg2 // Add the data to the General/Home/Work address variables. - CaptureString(&PropertySeg2, FALSE); - - NoteList->insert(std::make_pair(*NoteCount, PropertySeg2)); + 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)); - NoteListTokens->insert(std::make_pair(*NoteCount, PropertyTokens)); - } } -void ContactDataObject::ProcessCategory(wxString PropertySeg1, wxString PropertySeg2, int *CategoryCount){ +void ContactDataObject::ProcessLogo(wxString PropertySeg1, wxString PropertySeg2, int *LogoCount){ + size_t intPropertyLen = PropertySeg1.Len(); std::map SplitPoints; std::map SplitLength; std::map::iterator SLiter; @@ -3785,36 +4429,24 @@ void ContactDataObject::ProcessCategory(wxString PropertySeg1, wxString Property wxString PropertyValue; wxString PropertyTokens; bool FirstToken = TRUE; - int intPrevValue = 12; + int intSplitsFound = 0; + int intSplitSize = 0; + int intPrevValue = 6; int intPref = 0; int intType = 0; - long ListCtrlIndex; SplitValues(&PropertySeg1, &SplitPoints, &SplitLength, intPrevValue); - intPrevValue = 11; + intPrevValue = 5; PropertyType PropType = PROPERTY_NONE; // Look for type before continuing. CheckType(&PropertySeg1, &SplitPoints, &SplitLength, &intPrevValue, &PropType); - - // Setup blank lines for later on. - - switch(PropType){ - case PROPERTY_NONE: - break; - case PROPERTY_HOME: - CategoriesListType.insert(std::make_pair(*CategoryCount, "home")); - break; - case PROPERTY_WORK: - CategoriesListType.insert(std::make_pair(*CategoryCount, "work")); - break; - } - intPrevValue = 11; - + intPrevValue = 5; + for (std::map::iterator intiter = SplitPoints.begin(); intiter != SplitPoints.end(); ++intiter){ @@ -3843,239 +4475,151 @@ void ContactDataObject::ProcessCategory(wxString PropertySeg1, wxString Property PropertyValue.Remove(0, 1); - } + } CaptureString(&PropertyValue, FALSE); if (PropertyName == wxT("ALTID")){ - - CategoriesListAltID.erase(*CategoryCount); - CategoriesListAltID.insert(std::make_pair(*CategoryCount, PropertyValue)); + + LogosListAltID.erase(*LogoCount); + LogosListAltID.insert(std::make_pair(*LogoCount, PropertyValue)); } else if (PropertyName == wxT("PID")){ - CategoriesListPID.erase(*CategoryCount); - CategoriesListPID.insert(std::make_pair(*CategoryCount, PropertyValue)); + LogosListPID.erase(*LogoCount); + LogosListPID.insert(std::make_pair(*LogoCount, 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){ - - CategoriesListPref.erase(*CategoryCount); - CategoriesListPref.insert(std::make_pair(*CategoryCount, PriorityNumber)); - } - - } else if (PropertyName == wxT("LANGUAGE")){ + ProcessIntegerValue(&LogosListPref, &PropertyValue, LogoCount); - CategoriesListLanguage.erase(*CategoryCount); - CategoriesListLanguage.insert(std::make_pair(*CategoryCount, PropertyValue)); + } else if (PropertyName == wxT("MEDIATYPE")){ + LogosListMediatype.erase(*LogoCount); + LogosListMediatype.insert(std::make_pair(*LogoCount, PropertyValue)); + } else { // Something else we don't know about so append // to the tokens variable. - + if (!PropertyName.IsEmpty() && !PropertyValue.IsEmpty() && PropertyName != wxT("TYPE")){ - - if (FirstToken == TRUE){ + if (FirstToken == TRUE){ + PropertyTokens.Append(PropertyName + wxT("=") + PropertyValue); FirstToken = FALSE; - + } else { - + PropertyTokens.Append(wxT(";") + PropertyName + wxT("=") + PropertyValue); - + } - + } } - } - - // Deal with multiple categories. - - int intOrigCatCount = *CategoryCount; - bool FirstCategoryProcessed = TRUE; - bool AfterFirstToken = FALSE; - int intSplitSize = 0; - int intSplitsFound = 0; - int intSplitSeek = 0; - int intPropertyLen = PropertySeg2.Len(); + } + intPropertyLen = PropertySeg2.Len(); SplitPoints.clear(); SplitLength.clear(); - intPrevValue = 0; - - for (int i = 0; i <= intPropertyLen; i++){ - - if (intSplitSize == 0 && PropertySeg2.Mid(i, 1) == wxT(" ")){ + intSplitsFound = 0; + intSplitSize = 0; + intPrevValue = 0; - continue; - - } + CaptureString(&PropertySeg2, FALSE); + for (int i = 0; i <= intPropertyLen; i++){ + intSplitSize++; - if (PropertySeg2.Mid(i, 1) == wxT(",") && PropertySeg2.Mid((i - 1), 1) != wxT("\\")){ + if (PropertySeg2.Mid(i, 1) == wxT(";")){ - if (AfterFirstToken == TRUE){ - - SplitPoints.insert(std::make_pair(intSplitsFound, (i - intSplitSize + 1))); - SplitLength.insert(std::make_pair(intSplitsFound, (intSplitSize - 2))); + intSplitsFound++; + SplitPoints.insert(std::make_pair(intSplitsFound, (i + 1))); + if (intSplitsFound == 6){ + + SplitLength.insert(std::make_pair(intSplitsFound, (intSplitSize - 1))); + break; + } else { - SplitPoints.insert(std::make_pair(intSplitsFound, 0)); - SplitLength.insert(std::make_pair(intSplitsFound, (intSplitSize - 2))); - AfterFirstToken = TRUE; - + SplitLength.insert(std::make_pair(intSplitsFound, (intSplitSize - 1))); + } + + intSplitSize = 0; + + } - intSplitsFound++; - intSplitSeek = i; - intSplitSize = 0; + } - } + wxString wxSPhotoURI; + wxString wxSPhotoMIME; + wxString wxSPhotoEncoding; + wxString wxSPhotoData; + std::string base64enc; - } + if (intSplitsFound == 0){ - if (SplitPoints.size() > 0){ + } else { - SplitPoints.insert(std::make_pair(intSplitsFound, (intSplitSeek + 1))); - SplitLength.insert(std::make_pair(intSplitsFound, intSplitSize)); + std::map::iterator striter; - } + striter = SplitLength.find(1); - if (SplitPoints.size() == 0){ + wxStringTokenizer wSTDataType(PropertySeg2.Mid(0, striter->second), wxT(":")); - CategoriesList.insert(std::make_pair(*CategoryCount, PropertySeg2)); + while (wSTDataType.HasMoreTokens() == TRUE){ + + wxSPhotoURI = wSTDataType.GetNextToken(); + wxSPhotoMIME = wSTDataType.GetNextToken(); + break; + + } - if (!PropertyTokens.IsEmpty()){ + wxStringTokenizer wSTDataInfo(PropertySeg2.Mid((striter->second + 1)), wxT(",")); + + while (wSTDataInfo.HasMoreTokens() == TRUE){ - CategoriesListTokens.insert(std::make_pair(*CategoryCount, PropertyTokens)); + wxSPhotoEncoding = wSTDataInfo.GetNextToken(); + wxSPhotoData = wSTDataInfo.GetNextToken(); + base64enc = wxSPhotoData.mb_str(); + break; } } - for (std::map::iterator intiter = SplitPoints.begin(); - intiter != SplitPoints.end(); ++intiter){ - - SLiter = SplitLength.find(intiter->first); - - intPrevValue = intiter->second; - - PropertyData = PropertySeg2.Mid(intPrevValue, (SLiter->second + 1)); - - // Add the data to the General/Home/Work address variables. - - // Trim any whitespace from the start and end. + // Add the data to the General/Home/Work address variables. - PropertyData = PropertyData.Trim(FALSE); - PropertyData = PropertyData.Trim(TRUE); + LogosList.insert(std::make_pair(*LogoCount, base64enc)); + LogosListPictureType.insert(std::make_pair(*LogoCount, wxSPhotoMIME)); + LogosListPicEncType.insert(std::make_pair(*LogoCount, wxSPhotoEncoding)); - CaptureString(&PropertyData, FALSE); - - if (FirstCategoryProcessed == TRUE){ - - FirstCategoryProcessed = FALSE; - - CategoriesList.insert(std::make_pair(*CategoryCount, PropertyData)); + switch(PropType){ + case PROPERTY_NONE: + break; + case PROPERTY_HOME: + LogosListType.insert(std::make_pair(*LogoCount, "home")); + break; + case PROPERTY_WORK: + LogosListType.insert(std::make_pair(*LogoCount, "work")); + break; + } - if (!PropertyTokens.IsEmpty()){ - - CategoriesListTokens.insert(std::make_pair(*CategoryCount, PropertyTokens)); - - } - - continue; - - } else { + if (!PropertyTokens.IsEmpty()){ - (*CategoryCount)++; - - CategoriesList.insert(std::make_pair(*CategoryCount, PropertyData)); - - if (!PropertyTokens.IsEmpty()){ - - CategoriesListTokens.insert(std::make_pair(*CategoryCount, PropertyTokens)); - - } - - } - - // Copy the properties to each of the categories (if it exists). - - if (!PropertyTokens.IsEmpty()){ - - CategoriesListTokens.insert(std::make_pair(*CategoryCount, CategoriesListTokens.find(intOrigCatCount)->second)); - - } - - // Check if ALTID was used. - - if (CategoriesListAltID.find(intOrigCatCount) != CategoriesListAltID.end()){ - - CategoriesListAltID.insert(std::make_pair(*CategoryCount, CategoriesListAltID.find(intOrigCatCount)->second)); - - } - - // Check if PID was used. - - if (CategoriesListPID.find(intOrigCatCount) != CategoriesListPID.end()){ - - CategoriesListPID.insert(std::make_pair(*CategoryCount, CategoriesListPID.find(intOrigCatCount)->second)); - - } - - // Check if PREF was used. - - if (CategoriesListPref.find(intOrigCatCount) != CategoriesListPref.end()){ - - CategoriesListPref.insert(std::make_pair(*CategoryCount, CategoriesListPref.find(intOrigCatCount)->second)); - - } - - // Check if LANGUAGE was used. - - if (CategoriesListLanguage.find(intOrigCatCount) != CategoriesListLanguage.end()){ - - CategoriesListLanguage.insert(std::make_pair(*CategoryCount, CategoriesListLanguage.find(intOrigCatCount)->second)); - - } - - // Check if TYPE was used. - - switch(PropType){ - case PROPERTY_NONE: - break; - case PROPERTY_HOME: - CategoriesListType.insert(std::make_pair(*CategoryCount, "home")); - break; - case PROPERTY_WORK: - CategoriesListType.insert(std::make_pair(*CategoryCount, "work")); - break; - } + LogosListTokens.insert(std::make_pair(*LogoCount, PropertyTokens)); } } -void ContactDataObject::ProcessPhoto(wxString PropertySeg1, wxString PropertySeg2, int *PhotoCount){ +void ContactDataObject::ProcessSound(wxString PropertySeg1, wxString PropertySeg2, int *SoundCount){ size_t intPropertyLen = PropertySeg1.Len(); std::map SplitPoints; @@ -4097,9 +4641,9 @@ void ContactDataObject::ProcessPhoto(wxString PropertySeg1, wxString PropertySeg intPrevValue = 6; PropertyType PropType = PROPERTY_NONE; - - // Look for type before continuing. + // Look for type before continuing. + CheckType(&PropertySeg1, &SplitPoints, &SplitLength, &intPrevValue, &PropType); intPrevValue = 6; @@ -4132,45 +4676,34 @@ void ContactDataObject::ProcessPhoto(wxString PropertySeg1, wxString PropertySeg PropertyValue.Remove(0, 1); - } + } CaptureString(&PropertyValue, FALSE); if (PropertyName == wxT("ALTID")){ - PicturesListAltID.erase(*PhotoCount); - PicturesListAltID.insert(std::make_pair(*PhotoCount, PropertyValue)); + SoundsListAltID.erase(*SoundCount); + SoundsListAltID.insert(std::make_pair(*SoundCount, PropertyValue)); } else if (PropertyName == wxT("PID")){ - PicturesListPID.erase(*PhotoCount); - PicturesListPID.insert(std::make_pair(*PhotoCount, PropertyValue)); + SoundsListPID.erase(*SoundCount); + SoundsListPID.insert(std::make_pair(*SoundCount, 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){ - PicturesListPref.erase(*PhotoCount); - PicturesListPref.insert(std::make_pair(*PhotoCount, PriorityNumber)); - - } + ProcessIntegerValue(&SoundsListPref, &PropertyValue, SoundCount); } else if (PropertyName == wxT("MEDIATYPE")){ - PicturesListMediatype.erase(*PhotoCount); - PicturesListMediatype.insert(std::make_pair(*PhotoCount, PropertyValue)); - + SoundsListMediatype.erase(*SoundCount); + SoundsListMediatype.insert(std::make_pair(*SoundCount, PropertyValue)); + + } else if (PropertyName == wxT("LANGUAGE")){ + + SoundsListLanguage.erase(*SoundCount); + SoundsListLanguage.insert(std::make_pair(*SoundCount, PropertyValue)); + } else { // Something else we don't know about so append @@ -4200,7 +4733,7 @@ void ContactDataObject::ProcessPhoto(wxString PropertySeg1, wxString PropertySeg SplitLength.clear(); intSplitsFound = 0; intSplitSize = 0; - intPrevValue = 0; + intPrevValue = 0; CaptureString(&PropertySeg2, FALSE); @@ -4230,10 +4763,10 @@ void ContactDataObject::ProcessPhoto(wxString PropertySeg1, wxString PropertySeg } - wxString wxSPhotoURI; - wxString wxSPhotoMIME; - wxString wxSPhotoEncoding; - wxString wxSPhotoData; + wxString wxSSoundURI; + wxString wxSSoundMIME; + wxString wxSSoundEncoding; + wxString wxSSoundData; std::string base64enc; if (intSplitsFound == 0){ @@ -4248,8 +4781,8 @@ void ContactDataObject::ProcessPhoto(wxString PropertySeg1, wxString PropertySeg while (wSTDataType.HasMoreTokens() == TRUE){ - wxSPhotoURI = wSTDataType.GetNextToken(); - wxSPhotoMIME = wSTDataType.GetNextToken(); + wxSSoundURI = wSTDataType.GetNextToken(); + wxSSoundMIME = wSTDataType.GetNextToken(); break; } @@ -4258,9 +4791,9 @@ void ContactDataObject::ProcessPhoto(wxString PropertySeg1, wxString PropertySeg while (wSTDataInfo.HasMoreTokens() == TRUE){ - wxSPhotoEncoding = wSTDataInfo.GetNextToken(); - wxSPhotoData = wSTDataInfo.GetNextToken(); - base64enc = wxSPhotoData.mb_str(); + wxSSoundEncoding = wSTDataInfo.GetNextToken(); + wxSSoundData = wSTDataInfo.GetNextToken(); + base64enc = wxSSoundData.mb_str(); break; } @@ -4268,31 +4801,31 @@ 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)); - + switch(PropType){ case PROPERTY_NONE: break; case PROPERTY_HOME: - PicturesListType.insert(std::make_pair(*PhotoCount, "home")); + SoundsListType.insert(std::make_pair(*SoundCount, "home")); break; case PROPERTY_WORK: - PicturesListType.insert(std::make_pair(*PhotoCount, "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()){ - - PicturesListTokens.insert(std::make_pair(*PhotoCount, PropertyTokens)); + + SoundsListTokens.insert(std::make_pair(*SoundCount, PropertyTokens)); } - + } -void ContactDataObject::ProcessLogo(wxString PropertySeg1, wxString PropertySeg2, int *LogoCount){ +void ContactDataObject::ProcessCalendarURI(wxString PropertySeg1, wxString PropertySeg2, int *CalURICount){ size_t intPropertyLen = PropertySeg1.Len(); std::map SplitPoints; @@ -4305,21 +4838,21 @@ void ContactDataObject::ProcessLogo(wxString PropertySeg1, wxString PropertySeg2 bool FirstToken = TRUE; int intSplitsFound = 0; int intSplitSize = 0; - int intPrevValue = 6; + int intPrevValue = 8; int intPref = 0; int intType = 0; SplitValues(&PropertySeg1, &SplitPoints, &SplitLength, intPrevValue); - intPrevValue = 5; + intPrevValue = 7; PropertyType PropType = PROPERTY_NONE; - - // Look for type before continuing. + // Look for type before continuing. + CheckType(&PropertySeg1, &SplitPoints, &SplitLength, &intPrevValue, &PropType); - intPrevValue = 5; + intPrevValue = 7; for (std::map::iterator intiter = SplitPoints.begin(); intiter != SplitPoints.end(); ++intiter){ @@ -4349,45 +4882,29 @@ void ContactDataObject::ProcessLogo(wxString PropertySeg1, wxString PropertySeg2 PropertyValue.Remove(0, 1); - } + } CaptureString(&PropertyValue, FALSE); if (PropertyName == wxT("ALTID")){ - LogosListAltID.erase(*LogoCount); - LogosListAltID.insert(std::make_pair(*LogoCount, PropertyValue)); + CalendarListAltID.erase(*CalURICount); + CalendarListAltID.insert(std::make_pair(*CalURICount, PropertyValue)); } else if (PropertyName == wxT("PID")){ - LogosListPID.erase(*LogoCount); - LogosListPID.insert(std::make_pair(*LogoCount, PropertyValue)); + CalendarListPID.erase(*CalURICount); + CalendarListPID.insert(std::make_pair(*CalURICount, PropertyValue)); } else if (PropertyName == wxT("PREF")){ - - int PriorityNumber = 0; - bool ValidNumber = TRUE; - - try{ - PriorityNumber = std::stoi(PropertyValue.ToStdString()); - } - - catch(std::invalid_argument &e){ - ValidNumber = FALSE; - } - - if (ValidNumber == TRUE){ - LogosListPref.erase(*LogoCount); - LogosListPref.insert(std::make_pair(*LogoCount, PriorityNumber)); - - } + ProcessIntegerValue(&CalendarListPref, &PropertyValue, CalURICount); } else if (PropertyName == wxT("MEDIATYPE")){ - LogosListMediatype.erase(*LogoCount); - LogosListMediatype.insert(std::make_pair(*LogoCount, PropertyValue)); - + CalendarListMediatype.erase(*CalURICount); + CalendarListMediatype.insert(std::make_pair(*CalURICount, PropertyValue)); + } else { // Something else we don't know about so append @@ -4417,99 +4934,170 @@ void ContactDataObject::ProcessLogo(wxString PropertySeg1, wxString PropertySeg2 SplitLength.clear(); intSplitsFound = 0; intSplitSize = 0; - intPrevValue = 0; + intPrevValue = 0; CaptureString(&PropertySeg2, FALSE); - for (int i = 0; i <= intPropertyLen; i++){ - - intSplitSize++; + // 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; + } - if (PropertySeg2.Mid(i, 1) == wxT(";")){ + CalendarList.insert(std::make_pair(*CalURICount, PropertySeg2)); - 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; + if (!PropertyTokens.IsEmpty()){ - } - - } + CalendarListTokens.insert(std::make_pair(*CalURICount, PropertyTokens)); - wxString wxSPhotoURI; - wxString wxSPhotoMIME; - wxString wxSPhotoEncoding; - wxString wxSPhotoData; - std::string base64enc; + } + +} + +void ContactDataObject::ProcessCalendarAddressURI(wxString PropertySeg1, wxString PropertySeg2, int *CalAdrURICount){ + + size_t intPropertyLen = PropertySeg1.Len(); + std::map SplitPoints; + std::map SplitLength; + std::map::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; - if (intSplitsFound == 0){ + SplitValues(&PropertySeg1, &SplitPoints, &SplitLength, intPrevValue); - } else { + intPrevValue = 7; - std::map::iterator striter; + PropertyType PropType = PROPERTY_NONE; - striter = SplitLength.find(1); + // Look for type before continuing. + + CheckType(&PropertySeg1, &SplitPoints, &SplitLength, &intPrevValue, &PropType); + + intPrevValue = 7; + + for (std::map::iterator intiter = SplitPoints.begin(); + intiter != SplitPoints.end(); ++intiter){ - wxStringTokenizer wSTDataType(PropertySeg2.Mid(0, striter->second), wxT(":")); + SLiter = SplitLength.find(intiter->first); - while (wSTDataType.HasMoreTokens() == TRUE){ + PropertyData = PropertySeg1.Mid(intPrevValue, (SLiter->second)); - wxSPhotoURI = wSTDataType.GetNextToken(); - wxSPhotoMIME = wSTDataType.GetNextToken(); - break; + 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); + } - - wxStringTokenizer wSTDataInfo(PropertySeg2.Mid((striter->second + 1)), wxT(",")); - - while (wSTDataInfo.HasMoreTokens() == TRUE){ - wxSPhotoEncoding = wSTDataInfo.GetNextToken(); - wxSPhotoData = wSTDataInfo.GetNextToken(); - base64enc = wxSPhotoData.mb_str(); - break; + CaptureString(&PropertyValue, FALSE); + + if (PropertyName == wxT("ALTID")){ + + CalendarRequestListAltID.erase(*CalAdrURICount); + CalendarRequestListAltID.insert(std::make_pair(*CalAdrURICount, PropertyValue)); + + } else if (PropertyName == wxT("PID")){ + + CalendarRequestListPID.erase(*CalAdrURICount); + CalendarRequestListPID.insert(std::make_pair(*CalAdrURICount, PropertyValue)); + + } else if (PropertyName == wxT("PREF")){ + + ProcessIntegerValue(&CalendarRequestListPref, &PropertyValue, CalAdrURICount); + + } else if (PropertyName == wxT("MEDIATYPE")){ + + CalendarRequestListMediatype.erase(*CalAdrURICount); + CalendarRequestListMediatype.insert(std::make_pair(*CalAdrURICount, PropertyValue)); + + } else { + + // Something else we don't know about so append + // to the tokens variable. + + if (!PropertyName.IsEmpty() && !PropertyValue.IsEmpty() && PropertyName != wxT("TYPE")){ + + if (FirstToken == TRUE){ + + PropertyTokens.Append(PropertyName + wxT("=") + PropertyValue); + FirstToken = FALSE; + + } else { + + PropertyTokens.Append(wxT(";") + PropertyName + wxT("=") + PropertyValue); + + } + + } } - } + } - // Add the data to the General/Home/Work address variables. + intPropertyLen = PropertySeg2.Len(); + SplitPoints.clear(); + SplitLength.clear(); + intSplitsFound = 0; + intSplitSize = 0; + intPrevValue = 0; - LogosList.insert(std::make_pair(*LogoCount, base64enc)); - LogosListPictureType.insert(std::make_pair(*LogoCount, wxSPhotoMIME)); - LogosListPicEncType.insert(std::make_pair(*LogoCount, wxSPhotoEncoding)); + CaptureString(&PropertySeg2, FALSE); + // Add the data to the General/Home/Work address variables. + switch(PropType){ case PROPERTY_NONE: break; case PROPERTY_HOME: - LogosListType.insert(std::make_pair(*LogoCount, "home")); + CalendarRequestListType.insert(std::make_pair(*CalAdrURICount, "home")); break; case PROPERTY_WORK: - LogosListType.insert(std::make_pair(*LogoCount, "work")); + CalendarRequestListType.insert(std::make_pair(*CalAdrURICount, "work")); break; } + CalendarRequestList.insert(std::make_pair(*CalAdrURICount, PropertySeg2)); + if (!PropertyTokens.IsEmpty()){ - - LogosListTokens.insert(std::make_pair(*LogoCount, PropertyTokens)); - } - + CalendarRequestListTokens.insert(std::make_pair(*CalAdrURICount, PropertyTokens)); + + } + } -void ContactDataObject::ProcessSound(wxString PropertySeg1, wxString PropertySeg2, int *SoundCount){ +void ContactDataObject::ProcessCalendarFreeBusy(wxString PropertySeg1, wxString PropertySeg2, int *FreeBusyAddressCount){ size_t intPropertyLen = PropertySeg1.Len(); std::map SplitPoints; @@ -4572,43 +5160,22 @@ void ContactDataObject::ProcessSound(wxString PropertySeg1, wxString PropertySeg if (PropertyName == wxT("ALTID")){ - SoundsListAltID.erase(*SoundCount); - SoundsListAltID.insert(std::make_pair(*SoundCount, PropertyValue)); + FreeBusyListAltID.erase(*FreeBusyAddressCount); + FreeBusyListAltID.insert(std::make_pair(*FreeBusyAddressCount, PropertyValue)); } else if (PropertyName == wxT("PID")){ - SoundsListPID.erase(*SoundCount); - SoundsListPID.insert(std::make_pair(*SoundCount, PropertyValue)); + FreeBusyListPID.erase(*FreeBusyAddressCount); + FreeBusyListPID.insert(std::make_pair(*FreeBusyAddressCount, 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){ - - SoundsListPref.erase(*SoundCount); - SoundsListPref.insert(std::make_pair(*SoundCount, PriorityNumber)); - } + ProcessIntegerValue(&FreeBusyListPref, &PropertyValue, FreeBusyAddressCount); } else if (PropertyName == wxT("MEDIATYPE")){ - SoundsListMediatype.erase(*SoundCount); - SoundsListMediatype.insert(std::make_pair(*SoundCount, PropertyValue)); - - } else if (PropertyName == wxT("LANGUAGE")){ - - SoundsListLanguage.erase(*SoundCount); - SoundsListLanguage.insert(std::make_pair(*SoundCount, PropertyValue)); + FreeBusyListMediatype.erase(*FreeBusyAddressCount); + FreeBusyListMediatype.insert(std::make_pair(*FreeBusyAddressCount, PropertyValue)); } else { @@ -4643,95 +5210,30 @@ void ContactDataObject::ProcessSound(wxString PropertySeg1, wxString PropertySeg 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::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")); + FreeBusyListType.insert(std::make_pair(*FreeBusyAddressCount, "home")); break; case PROPERTY_WORK: - SoundsListType.insert(std::make_pair(*SoundCount, "work")); + FreeBusyListType.insert(std::make_pair(*FreeBusyAddressCount, "work")); break; } - SoundsList.insert(std::make_pair(*SoundCount, base64enc)); - SoundsListAudioEncType.insert(std::make_pair(*SoundCount, wxSSoundEncoding)); - SoundsListAudioType.insert(std::make_pair(*SoundCount, wxSSoundMIME)); + FreeBusyList.insert(std::make_pair(*FreeBusyAddressCount, PropertySeg2)); if (!PropertyTokens.IsEmpty()){ - SoundsListTokens.insert(std::make_pair(*SoundCount, PropertyTokens)); + FreeBusyListTokens.insert(std::make_pair(*FreeBusyAddressCount, PropertyTokens)); } - + } -void ContactDataObject::ProcessCalendarURI(wxString PropertySeg1, wxString PropertySeg2, int *CalURICount){ +void ContactDataObject::ProcessKey(wxString PropertySeg1, wxString PropertySeg2, int *KeyCount){ size_t intPropertyLen = PropertySeg1.Len(); std::map SplitPoints; @@ -4744,21 +5246,22 @@ void ContactDataObject::ProcessCalendarURI(wxString PropertySeg1, wxString Prope bool FirstToken = TRUE; int intSplitsFound = 0; int intSplitSize = 0; - int intPrevValue = 8; + int intPrevValue = 5; int intPref = 0; int intType = 0; + long ListCtrlIndex; SplitValues(&PropertySeg1, &SplitPoints, &SplitLength, intPrevValue); - intPrevValue = 7; + intPrevValue = 4; PropertyType PropType = PROPERTY_NONE; - // Look for type before continuing. + // Look for type before continuing. CheckType(&PropertySeg1, &SplitPoints, &SplitLength, &intPrevValue, &PropType); - intPrevValue = 7; + intPrevValue = 4; for (std::map::iterator intiter = SplitPoints.begin(); intiter != SplitPoints.end(); ++intiter){ @@ -4788,45 +5291,22 @@ void ContactDataObject::ProcessCalendarURI(wxString PropertySeg1, wxString Prope PropertyValue.Remove(0, 1); - } - - CaptureString(&PropertyValue, FALSE); + } if (PropertyName == wxT("ALTID")){ - CalendarListAltID.erase(*CalURICount); - CalendarListAltID.insert(std::make_pair(*CalURICount, PropertyValue)); + KeyListAltID.erase(*KeyCount); + KeyListAltID.insert(std::make_pair(*KeyCount, PropertyValue)); } else if (PropertyName == wxT("PID")){ - CalendarListPID.erase(*CalURICount); - CalendarListPID.insert(std::make_pair(*CalURICount, PropertyValue)); + KeyListPID.erase(*KeyCount); + KeyListPID.insert(std::make_pair(*KeyCount, PropertyValue)); } else if (PropertyName == wxT("PREF")){ - - int PriorityNumber = 0; - bool ValidNumber = TRUE; - - try{ - PriorityNumber = std::stoi(PropertyValue.ToStdString()); - } - - catch(std::invalid_argument &e){ - ValidNumber = FALSE; - } - - if (ValidNumber == TRUE){ - CalendarListPref.erase(*CalURICount); - CalendarListPref.insert(std::make_pair(*CalURICount, PriorityNumber)); - - } - - } else if (PropertyName == wxT("MEDIATYPE")){ + ProcessIntegerValue(&KeyListPref, &PropertyValue, KeyCount); - CalendarListMediatype.erase(*CalURICount); - CalendarListMediatype.insert(std::make_pair(*CalURICount, PropertyValue)); - } else { // Something else we don't know about so append @@ -4849,36 +5329,224 @@ void ContactDataObject::ProcessCalendarURI(wxString PropertySeg1, wxString Prope } - } + } intPropertyLen = PropertySeg2.Len(); SplitPoints.clear(); SplitLength.clear(); intSplitsFound = 0; intSplitSize = 0; - intPrevValue = 0; + intPrevValue = 0; - CaptureString(&PropertySeg2, FALSE); + 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::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")){ - switch(PropType){ + 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: - CalendarListType.insert(std::make_pair(*CalURICount, "home")); + case PROPERTY_HOME: + KeyListType.insert(std::make_pair(*KeyCount, wxT("home"))); break; - case PROPERTY_WORK: - CalendarListType.insert(std::make_pair(*CalURICount, "work")); + 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. - CalendarList.insert(std::make_pair(*CalURICount, PropertySeg2)); + wxStringTokenizer wSTVendorDetails(PropertySeg1, wxT("-")); - if (!PropertyTokens.IsEmpty()){ + wxString wxSVNDID; + wxString wxSVNDPropName; + long ListCtrlIndex; + + while (wSTVendorDetails.HasMoreTokens() == TRUE){ - CalendarListTokens.insert(std::make_pair(*CalURICount, PropertyTokens)); + wSTVendorDetails.GetNextToken(); + wxSVNDID = wSTVendorDetails.GetNextToken(); + wxSVNDPropName = wSTVendorDetails.GetNextToken(); + break; + + } + + if (!wxSVNDID.IsEmpty() && !wxSVNDPropName.IsEmpty()){ + + // Add the data to the vendor variables. + + VendorList.erase(*VendorCount); + VendorListPEN.erase(*VendorCount); + VendorListElement.erase(*VendorCount); + VendorList.insert(std::make_pair(*VendorCount, PropertySeg2)); + VendorListPEN.insert(std::make_pair(*VendorCount, wxSVNDID)); + VendorListElement.insert(std::make_pair(*VendorCount, wxSVNDPropName)); + + } + +} + +void ProcessStringValue(wxString *PropertyName, + wxString PropertyNameMatch, + std::map *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 *PrefPtr, + wxString *PropertyValue, + int *ItemCount, + bool *PropertyMatched){ + + if (*PropertyName == PropertyNameMatch){ + *PropertyMatched = TRUE; + } else { + return; + } + + int PriorityNumber = 0; + bool ValidNumber = TRUE; + + try{ + PriorityNumber = std::stoi(PropertyValue->ToStdString()); + } + + catch(std::invalid_argument &e){ + ValidNumber = FALSE; + } + + if (ValidNumber == TRUE){ + + PrefPtr->erase(*ItemCount); + PrefPtr->insert(std::make_pair(*ItemCount, PriorityNumber)); + + } + +} + +void ProcessIntegerValue(std::map *PrefPtr, + wxString *PropertyValue, + int *ItemCount){ + + int PriorityNumber = 0; + bool ValidNumber = TRUE; + + try{ + PriorityNumber = std::stoi(PropertyValue->ToStdString()); + } + + catch(std::invalid_argument &e){ + ValidNumber = FALSE; + } + + if (ValidNumber == TRUE){ + + PrefPtr->erase(*ItemCount); + PrefPtr->insert(std::make_pair(*ItemCount, PriorityNumber)); + } }