X-Git-Url: http://Server1/repobrowser/?a=blobdiff_plain;f=source%2Fcontacteditor%2FContactDataObject.cpp;h=ffca4603a8bd88aae2ed7336a80b9fef1355606b;hb=6cd8a887c1e346fef41e94e6593248246cf3c729;hp=1bc8b77560d5497586117aa39e05bd5516fb0afb;hpb=78a23a10b1ff0a041ab18891290a160b41d94530;p=xestiaab%2F.git diff --git a/source/contacteditor/ContactDataObject.cpp b/source/contacteditor/ContactDataObject.cpp index 1bc8b77..ffca460 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; @@ -98,6 +101,16 @@ ContactLoadStatus ContactDataObject::LoadFile(wxString Filename){ int NoteCount = 0; int CategoryCount = 0; int PhotoCount = 0; + int LogoCount = 0; + int SoundCount = 0; + int CalendarCount = 0; + int CalendarAddressCount = 0; + int FreeBusyAddressCount = 0; + int KeyCount = 0; + int VendorCount = 0; + int XTokenCount = 0; + int XMLCount = 0; + int ClientPIDCount = 0; wxString ContactLine; wxString PropertyLine; wxString PropertySeg1; @@ -200,6 +213,26 @@ ContactLoadStatus ContactDataObject::LoadFile(wxString Filename){ ProcessKind(PropertySeg2); + } else if (Property == wxT("UID") && UIDProcessed == FALSE){ + + UIDToken = PropertySeg2; + UIDProcessed = TRUE; + + } else if (Property == wxT("SOURCE")){ + + ProcessSource(PropertySeg1, PropertySeg2, &SourceCount); + SourceCount++; + + } else if (Property == wxT("XML")){ + + ProcessXML(PropertySeg1, PropertySeg2, &XMLCount); + XMLCount++; + + } else if (Property == wxT("REV") && RevisionProcessed == FALSE){ + + ProcessRevision(PropertySeg1, PropertySeg2); + RevisionProcessed = TRUE; + } else if (Property == wxT("MEMBER")){ ProcessMember(PropertySeg1, PropertySeg2, &GroupCount); @@ -215,6 +248,11 @@ ContactLoadStatus ContactDataObject::LoadFile(wxString Filename){ ProcessN(PropertySeg1, PropertySeg2); NameProcessed = TRUE; + } else if (Property == wxT("CLIENTPIDMAP")){ + + ProcessClientPIDMap(PropertySeg1, PropertySeg2, &ClientPIDCount); + ClientPIDCount++; + } else if (Property == wxT("NICKNAME")){ ProcessNickname(PropertySeg1, PropertySeg2, &NicknameCount); @@ -330,6 +368,64 @@ ContactLoadStatus ContactDataObject::LoadFile(wxString Filename){ ProcessPhoto(PropertySeg1, PropertySeg2, &PhotoCount); PhotoCount++; + } else if (Property == wxT("LOGO")) { + + // See frmContactEditor-LoadPhoto.cpp + + ProcessLogo(PropertySeg1, PropertySeg2, &LogoCount); + LogoCount++; + + } else if (Property == wxT("LOGO")) { + + // See frmContactEditor-LoadPhoto.cpp + + ProcessLogo(PropertySeg1, PropertySeg2, &LogoCount); + LogoCount++; + + } else if (Property == wxT("SOUND")) { + + // See frmContactEditor-LoadSound.cpp + + ProcessSound(PropertySeg1, PropertySeg2, &SoundCount); + SoundCount++; + + } else if (Property == wxT("CALURI")){ + + // See frmContactEditor-LoadCalendar.cpp + + ProcessCalendarURI(PropertySeg1, PropertySeg2, &CalendarCount); + CalendarCount++; + + } else if (Property == wxT("CALADRURI")){ + + ProcessCalendarAddressURI(PropertySeg1, PropertySeg2, &CalendarAddressCount); + CalendarAddressCount++; + + } else if (Property == wxT("FBURL")){ + + // See frmContactEditor-LoadCalendar.cpp + + ProcessCalendarFreeBusy(PropertySeg1, PropertySeg2, &FreeBusyAddressCount); + FreeBusyAddressCount++; + + } else if (Property == wxT("KEY")){ + + // See frmContactEditor-LoadKey.cpp + + ProcessKey(PropertySeg1, PropertySeg2, &KeyCount); + KeyCount++; + + } else if (Property.Mid(0, 3) == wxT("VND")){ + + ProcessVendor(PropertySeg1, PropertySeg2, &VendorCount); + VendorCount++; + + } else if (Property.Mid(0, 2) == wxT("X-")){ + + XTokenList.insert(std::make_pair(XTokenCount, PropertySeg2)); + XTokenListTokens.insert(std::make_pair(XTokenCount, PropertySeg1.Mid(2))); + XTokenCount++; + } } @@ -363,26 +459,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){ @@ -396,91 +493,80 @@ 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; + 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){ @@ -494,35 +580,37 @@ 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)); + if (PropertyName == wxT("ALTID")){ + + SourceListAltID.erase(*SourceCount); + SourceListAltID.insert(std::make_pair(*SourceCount, PropertyValue)); } else if (PropertyName == wxT("PID")){ - FullNamesListPID.erase(*FNCount); - FullNamesListPID.insert(std::make_pair(*FNCount, PropertyValue)); + SourceListPID.erase(*SourceCount); + SourceListPID.insert(std::make_pair(*SourceCount, PropertyValue)); } else if (PropertyName == wxT("PREF")){ - + int PriorityNumber = 0; bool ValidNumber = TRUE; @@ -536,50 +624,337 @@ void ContactDataObject::ProcessFN(wxString PropertySeg1, wxString PropertySeg2, if (ValidNumber == TRUE){ - FullNamesListPref.erase(*FNCount); - FullNamesListPref.insert(std::make_pair(*FNCount, PriorityNumber)); + SourceListPref.erase(*SourceCount); + SourceListPref.insert(std::make_pair(*SourceCount, PriorityNumber)); } - } else if (!PropertyName.IsEmpty() && !PropertyValue.IsEmpty()){ + } else if (PropertyName == wxT("MEDIATYPE")){ + + SourceListMediatype.erase(*SourceCount); + SourceListMediatype.insert(std::make_pair(*SourceCount, PropertyValue)); + + } else { + + // Something else we don't know about so append + // to the tokens variable. - if (FirstToken == TRUE){ + if (!PropertyName.IsEmpty() && !PropertyValue.IsEmpty() && PropertyName != wxT("TYPE")){ + + 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); + + } - } + } + + } + + } + + 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; + 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")){ + + XMLListAltID.erase(*XMLCount); + XMLListAltID.insert(std::make_pair(*XMLCount, PropertyValue)); + + } + + } + + 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")){ + + int PriorityNumber = 0; + bool ValidNumber = TRUE; + + try{ + PriorityNumber = std::stoi(PropertyValue.ToStdString()); + } + + 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 (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")){ + + int PriorityNumber = 0; + bool ValidNumber = TRUE; + + try{ + PriorityNumber = std::stoi(PropertyValue.ToStdString()); + } + + catch(std::invalid_argument &e){ + ValidNumber = FALSE; + } + + if (ValidNumber == TRUE){ + + FullNamesListPref.erase(*FNCount); + FullNamesListPref.insert(std::make_pair(*FNCount, PriorityNumber)); + + } + + } else if (!PropertyName.IsEmpty() && !PropertyValue.IsEmpty()){ + + if (FirstToken == TRUE){ + + PropertyTokens.Append(PropertyName + wxT("=") + PropertyValue); + FirstToken = FALSE; + + } else { + + PropertyTokens.Append(wxT(";") + PropertyName + wxT("=") + PropertyValue); + + } + + } + + } + + FullNamesList.insert(std::make_pair(*FNCount, PropertySeg2)); + + if (!PropertyTokens.IsEmpty()){ + + FullNamesListTokens.insert(std::make_pair(*FNCount, PropertyTokens)); + + } + +} + +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; @@ -723,14 +1098,98 @@ 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; - int intPref = 0; - + 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 = 13; + + 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.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; @@ -3564,14 +4023,1145 @@ void ContactDataObject::ProcessOrganisation(wxString PropertySeg1, wxString Prop if (!PropertyTokens.IsEmpty()){ - OrganisationsListTokens->insert(std::make_pair(*OrganisationCount, PropertyTokens)); - + OrganisationsListTokens->insert(std::make_pair(*OrganisationCount, PropertyTokens)); + + } + +} + +void ContactDataObject::ProcessNote(wxString PropertySeg1, wxString PropertySeg2, int *NoteCount){ + + 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 *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; + + 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")){ + + NoteListAltID->erase(*NoteCount); + NoteListAltID->insert(std::make_pair(*NoteCount, PropertyValue)); + + } else if (PropertyName == wxT("PID")){ + + NoteListPID->erase(*NoteCount); + NoteListPID->insert(std::make_pair(*NoteCount, PropertyValue)); + + } else if (PropertyName == wxT("PREF")){ + + int PriorityNumber = 0; + bool ValidNumber = TRUE; + + try{ + PriorityNumber = std::stoi(PropertyValue.ToStdString()); + } + + catch(std::invalid_argument &e){ + ValidNumber = FALSE; + } + + if (ValidNumber == TRUE){ + + NoteListPref->erase(*NoteCount); + NoteListPref->insert(std::make_pair(*NoteCount, PriorityNumber)); + + } + + } else if (PropertyName == wxT("LANGUAGE")){ + + NoteListLanguage->erase(*NoteCount); + NoteListLanguage->insert(std::make_pair(*NoteCount, PropertyValue)); + + } else { + + // Something else we don't know about so append + // to the tokens variable. + + if (!PropertyName.IsEmpty() && !PropertyValue.IsEmpty() && PropertyName != wxT("TYPE")){ + + if (FirstToken == TRUE){ + + PropertyTokens.Append(PropertyName + wxT("=") + PropertyValue); + FirstToken = FALSE; + + } else { + + PropertyTokens.Append(wxT(";") + PropertyName + wxT("=") + PropertyValue); + + } + + } + + } + + } + + // Add the data to the General/Home/Work address variables. + + CaptureString(&PropertySeg2, FALSE); + + NoteList->insert(std::make_pair(*NoteCount, PropertySeg2)); + + if (!PropertyTokens.IsEmpty()){ + + NoteListTokens->insert(std::make_pair(*NoteCount, PropertyTokens)); + + } + +} + +void ContactDataObject::ProcessCategory(wxString PropertySeg1, wxString PropertySeg2, int *CategoryCount){ + + std::map SplitPoints; + std::map SplitLength; + std::map::iterator SLiter; + wxString PropertyData; + wxString PropertyName; + wxString PropertyValue; + wxString PropertyTokens; + bool FirstToken = TRUE; + int intPrevValue = 12; + int intPref = 0; + int intType = 0; + long ListCtrlIndex; + + SplitValues(&PropertySeg1, &SplitPoints, &SplitLength, intPrevValue); + + intPrevValue = 11; + + PropertyType PropType = PROPERTY_NONE; + + // Look for type before continuing. + + CheckType(&PropertySeg1, &SplitPoints, &SplitLength, &intPrevValue, &PropType); + + // Setup blank lines for later on. + + switch(PropType){ + case PROPERTY_NONE: + break; + case PROPERTY_HOME: + CategoriesListType.insert(std::make_pair(*CategoryCount, "home")); + break; + case PROPERTY_WORK: + CategoriesListType.insert(std::make_pair(*CategoryCount, "work")); + break; + } + + intPrevValue = 11; + + for (std::map::iterator intiter = SplitPoints.begin(); + intiter != SplitPoints.end(); ++intiter){ + + SLiter = SplitLength.find(intiter->first); + + PropertyData = PropertySeg1.Mid(intPrevValue, (SLiter->second)); + + wxStringTokenizer PropertyElement (PropertyData, wxT("=")); + PropertyName = PropertyElement.GetNextToken(); + PropertyValue = PropertyElement.GetNextToken(); + + intPrevValue = intiter->second; + + // Process properties. + + size_t intPropertyValueLen = PropertyValue.Len(); + + if (PropertyValue.Mid((intPropertyValueLen - 1), 1) == wxT("\"")){ + + PropertyValue.Trim(); + PropertyValue.RemoveLast(); + + } + + if (PropertyValue.Mid(0, 1) == wxT("\"")){ + + PropertyValue.Remove(0, 1); + + } + + CaptureString(&PropertyValue, FALSE); + + if (PropertyName == wxT("ALTID")){ + + CategoriesListAltID.erase(*CategoryCount); + CategoriesListAltID.insert(std::make_pair(*CategoryCount, PropertyValue)); + + } else if (PropertyName == wxT("PID")){ + + CategoriesListPID.erase(*CategoryCount); + CategoriesListPID.insert(std::make_pair(*CategoryCount, PropertyValue)); + + } else if (PropertyName == wxT("PREF")){ + + int PriorityNumber = 0; + bool ValidNumber = TRUE; + + try{ + PriorityNumber = std::stoi(PropertyValue.ToStdString()); + } + + catch(std::invalid_argument &e){ + ValidNumber = FALSE; + } + + if (ValidNumber == TRUE){ + + CategoriesListPref.erase(*CategoryCount); + CategoriesListPref.insert(std::make_pair(*CategoryCount, PriorityNumber)); + + } + + } else if (PropertyName == wxT("LANGUAGE")){ + + CategoriesListLanguage.erase(*CategoryCount); + CategoriesListLanguage.insert(std::make_pair(*CategoryCount, PropertyValue)); + + } else { + + // Something else we don't know about so append + // to the tokens variable. + + if (!PropertyName.IsEmpty() && !PropertyValue.IsEmpty() && PropertyName != wxT("TYPE")){ + + if (FirstToken == TRUE){ + + PropertyTokens.Append(PropertyName + wxT("=") + PropertyValue); + FirstToken = FALSE; + + } else { + + PropertyTokens.Append(wxT(";") + PropertyName + wxT("=") + PropertyValue); + + } + + } + + } + + } + + // Deal with multiple categories. + + int intOrigCatCount = *CategoryCount; + bool FirstCategoryProcessed = TRUE; + bool AfterFirstToken = FALSE; + int intSplitSize = 0; + int intSplitsFound = 0; + int intSplitSeek = 0; + int intPropertyLen = PropertySeg2.Len(); + + SplitPoints.clear(); + SplitLength.clear(); + intPrevValue = 0; + + for (int i = 0; i <= intPropertyLen; i++){ + + if (intSplitSize == 0 && PropertySeg2.Mid(i, 1) == wxT(" ")){ + + continue; + + } + + intSplitSize++; + + if (PropertySeg2.Mid(i, 1) == wxT(",") && PropertySeg2.Mid((i - 1), 1) != wxT("\\")){ + + if (AfterFirstToken == TRUE){ + + SplitPoints.insert(std::make_pair(intSplitsFound, (i - intSplitSize + 1))); + SplitLength.insert(std::make_pair(intSplitsFound, (intSplitSize - 2))); + + } else { + + SplitPoints.insert(std::make_pair(intSplitsFound, 0)); + SplitLength.insert(std::make_pair(intSplitsFound, (intSplitSize - 2))); + AfterFirstToken = TRUE; + + } + + intSplitsFound++; + intSplitSeek = i; + intSplitSize = 0; + + } + + } + + if (SplitPoints.size() > 0){ + + SplitPoints.insert(std::make_pair(intSplitsFound, (intSplitSeek + 1))); + SplitLength.insert(std::make_pair(intSplitsFound, intSplitSize)); + + } + + if (SplitPoints.size() == 0){ + + CategoriesList.insert(std::make_pair(*CategoryCount, PropertySeg2)); + + if (!PropertyTokens.IsEmpty()){ + + CategoriesListTokens.insert(std::make_pair(*CategoryCount, PropertyTokens)); + + } + + } + + for (std::map::iterator intiter = SplitPoints.begin(); + intiter != SplitPoints.end(); ++intiter){ + + SLiter = SplitLength.find(intiter->first); + + intPrevValue = intiter->second; + + PropertyData = PropertySeg2.Mid(intPrevValue, (SLiter->second + 1)); + + // Add the data to the General/Home/Work address variables. + + // Trim any whitespace from the start and end. + + PropertyData = PropertyData.Trim(FALSE); + PropertyData = PropertyData.Trim(TRUE); + + CaptureString(&PropertyData, FALSE); + + if (FirstCategoryProcessed == TRUE){ + + FirstCategoryProcessed = FALSE; + + CategoriesList.insert(std::make_pair(*CategoryCount, PropertyData)); + + if (!PropertyTokens.IsEmpty()){ + + CategoriesListTokens.insert(std::make_pair(*CategoryCount, PropertyTokens)); + + } + + continue; + + } else { + + (*CategoryCount)++; + + CategoriesList.insert(std::make_pair(*CategoryCount, PropertyData)); + + if (!PropertyTokens.IsEmpty()){ + + CategoriesListTokens.insert(std::make_pair(*CategoryCount, PropertyTokens)); + + } + + } + + // Copy the properties to each of the categories (if it exists). + + if (!PropertyTokens.IsEmpty()){ + + CategoriesListTokens.insert(std::make_pair(*CategoryCount, CategoriesListTokens.find(intOrigCatCount)->second)); + + } + + // Check if ALTID was used. + + if (CategoriesListAltID.find(intOrigCatCount) != CategoriesListAltID.end()){ + + CategoriesListAltID.insert(std::make_pair(*CategoryCount, CategoriesListAltID.find(intOrigCatCount)->second)); + + } + + // Check if PID was used. + + if (CategoriesListPID.find(intOrigCatCount) != CategoriesListPID.end()){ + + CategoriesListPID.insert(std::make_pair(*CategoryCount, CategoriesListPID.find(intOrigCatCount)->second)); + + } + + // Check if PREF was used. + + if (CategoriesListPref.find(intOrigCatCount) != CategoriesListPref.end()){ + + CategoriesListPref.insert(std::make_pair(*CategoryCount, CategoriesListPref.find(intOrigCatCount)->second)); + + } + + // Check if LANGUAGE was used. + + if (CategoriesListLanguage.find(intOrigCatCount) != CategoriesListLanguage.end()){ + + CategoriesListLanguage.insert(std::make_pair(*CategoryCount, CategoriesListLanguage.find(intOrigCatCount)->second)); + + } + + // Check if TYPE was used. + + switch(PropType){ + case PROPERTY_NONE: + break; + case PROPERTY_HOME: + CategoriesListType.insert(std::make_pair(*CategoryCount, "home")); + break; + case PROPERTY_WORK: + CategoriesListType.insert(std::make_pair(*CategoryCount, "work")); + break; + } + + } + +} + +void ContactDataObject::ProcessPhoto(wxString PropertySeg1, wxString PropertySeg2, int *PhotoCount){ + + size_t intPropertyLen = PropertySeg1.Len(); + std::map 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 = 7; + int intPref = 0; + int intType = 0; + + SplitValues(&PropertySeg1, &SplitPoints, &SplitLength, intPrevValue); + + intPrevValue = 6; + + PropertyType PropType = PROPERTY_NONE; + + // Look for type before continuing. + + CheckType(&PropertySeg1, &SplitPoints, &SplitLength, &intPrevValue, &PropType); + + intPrevValue = 6; + + for (std::map::iterator intiter = SplitPoints.begin(); + intiter != SplitPoints.end(); ++intiter){ + + SLiter = SplitLength.find(intiter->first); + + PropertyData = PropertySeg1.Mid(intPrevValue, (SLiter->second)); + + wxStringTokenizer PropertyElement (PropertyData, wxT("=")); + PropertyName = PropertyElement.GetNextToken(); + PropertyValue = PropertyElement.GetNextToken(); + + intPrevValue = intiter->second; + + // Process properties. + + size_t intPropertyValueLen = PropertyValue.Len(); + + if (PropertyValue.Mid((intPropertyValueLen - 1), 1) == wxT("\"")){ + + PropertyValue.Trim(); + PropertyValue.RemoveLast(); + + } + + if (PropertyValue.Mid(0, 1) == wxT("\"")){ + + PropertyValue.Remove(0, 1); + + } + + CaptureString(&PropertyValue, FALSE); + + if (PropertyName == wxT("ALTID")){ + + PicturesListAltID.erase(*PhotoCount); + PicturesListAltID.insert(std::make_pair(*PhotoCount, PropertyValue)); + + } else if (PropertyName == wxT("PID")){ + + PicturesListPID.erase(*PhotoCount); + PicturesListPID.insert(std::make_pair(*PhotoCount, PropertyValue)); + + } else if (PropertyName == wxT("PREF")){ + + 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)); + + } + + } else if (PropertyName == wxT("MEDIATYPE")){ + + PicturesListMediatype.erase(*PhotoCount); + PicturesListMediatype.insert(std::make_pair(*PhotoCount, PropertyValue)); + + } else { + + // Something else we don't know about so append + // to the tokens variable. + + if (!PropertyName.IsEmpty() && !PropertyValue.IsEmpty() && PropertyName != wxT("TYPE")){ + + if (FirstToken == TRUE){ + + PropertyTokens.Append(PropertyName + wxT("=") + PropertyValue); + FirstToken = FALSE; + + } else { + + PropertyTokens.Append(wxT(";") + PropertyName + wxT("=") + PropertyValue); + + } + + } + + } + + } + + intPropertyLen = PropertySeg2.Len(); + SplitPoints.clear(); + SplitLength.clear(); + intSplitsFound = 0; + intSplitSize = 0; + intPrevValue = 0; + + CaptureString(&PropertySeg2, FALSE); + + for (int i = 0; i <= intPropertyLen; i++){ + + intSplitSize++; + + if (PropertySeg2.Mid(i, 1) == wxT(";")){ + + intSplitsFound++; + SplitPoints.insert(std::make_pair(intSplitsFound, (i + 1))); + + if (intSplitsFound == 6){ + + SplitLength.insert(std::make_pair(intSplitsFound, (intSplitSize - 1))); + break; + + } else { + + SplitLength.insert(std::make_pair(intSplitsFound, (intSplitSize - 1))); + + } + + intSplitSize = 0; + + } + + } + + wxString wxSPhotoURI; + wxString wxSPhotoMIME; + wxString wxSPhotoEncoding; + wxString wxSPhotoData; + std::string base64enc; + + if (intSplitsFound == 0){ + + } else { + + std::map::iterator striter; + + striter = SplitLength.find(1); + + wxStringTokenizer wSTDataType(PropertySeg2.Mid(0, striter->second), wxT(":")); + + while (wSTDataType.HasMoreTokens() == TRUE){ + + wxSPhotoURI = wSTDataType.GetNextToken(); + wxSPhotoMIME = wSTDataType.GetNextToken(); + break; + + } + + wxStringTokenizer wSTDataInfo(PropertySeg2.Mid((striter->second + 1)), wxT(",")); + + while (wSTDataInfo.HasMoreTokens() == TRUE){ + + wxSPhotoEncoding = wSTDataInfo.GetNextToken(); + wxSPhotoData = wSTDataInfo.GetNextToken(); + base64enc = wxSPhotoData.mb_str(); + break; + + } + + } + + // Add the data to the General/Home/Work address variables. + + PicturesList.insert(std::make_pair(*PhotoCount, base64enc)); + PicturesListPictureType.insert(std::make_pair(*PhotoCount, wxSPhotoMIME)); + PicturesListPicEncType.insert(std::make_pair(*PhotoCount, wxSPhotoEncoding)); + + switch(PropType){ + case PROPERTY_NONE: + break; + case PROPERTY_HOME: + PicturesListType.insert(std::make_pair(*PhotoCount, "home")); + break; + case PROPERTY_WORK: + PicturesListType.insert(std::make_pair(*PhotoCount, "work")); + break; + } + + if (!PropertyTokens.IsEmpty()){ + + PicturesListTokens.insert(std::make_pair(*PhotoCount, PropertyTokens)); + + } + +} + +void ContactDataObject::ProcessLogo(wxString PropertySeg1, wxString PropertySeg2, int *LogoCount){ + + size_t intPropertyLen = PropertySeg1.Len(); + std::map 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 = 6; + int intPref = 0; + int intType = 0; + + SplitValues(&PropertySeg1, &SplitPoints, &SplitLength, intPrevValue); + + intPrevValue = 5; + + PropertyType PropType = PROPERTY_NONE; + + // Look for type before continuing. + + CheckType(&PropertySeg1, &SplitPoints, &SplitLength, &intPrevValue, &PropType); + + intPrevValue = 5; + + for (std::map::iterator intiter = SplitPoints.begin(); + intiter != SplitPoints.end(); ++intiter){ + + SLiter = SplitLength.find(intiter->first); + + PropertyData = PropertySeg1.Mid(intPrevValue, (SLiter->second)); + + wxStringTokenizer PropertyElement (PropertyData, wxT("=")); + PropertyName = PropertyElement.GetNextToken(); + PropertyValue = PropertyElement.GetNextToken(); + + intPrevValue = intiter->second; + + // Process properties. + + size_t intPropertyValueLen = PropertyValue.Len(); + + if (PropertyValue.Mid((intPropertyValueLen - 1), 1) == wxT("\"")){ + + PropertyValue.Trim(); + PropertyValue.RemoveLast(); + + } + + if (PropertyValue.Mid(0, 1) == wxT("\"")){ + + PropertyValue.Remove(0, 1); + + } + + CaptureString(&PropertyValue, FALSE); + + if (PropertyName == wxT("ALTID")){ + + LogosListAltID.erase(*LogoCount); + LogosListAltID.insert(std::make_pair(*LogoCount, PropertyValue)); + + } else if (PropertyName == wxT("PID")){ + + LogosListPID.erase(*LogoCount); + LogosListPID.insert(std::make_pair(*LogoCount, PropertyValue)); + + } else if (PropertyName == wxT("PREF")){ + + 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)); + + } + + } else if (PropertyName == wxT("MEDIATYPE")){ + + LogosListMediatype.erase(*LogoCount); + LogosListMediatype.insert(std::make_pair(*LogoCount, PropertyValue)); + + } else { + + // Something else we don't know about so append + // to the tokens variable. + + if (!PropertyName.IsEmpty() && !PropertyValue.IsEmpty() && PropertyName != wxT("TYPE")){ + + if (FirstToken == TRUE){ + + PropertyTokens.Append(PropertyName + wxT("=") + PropertyValue); + FirstToken = FALSE; + + } else { + + PropertyTokens.Append(wxT(";") + PropertyName + wxT("=") + PropertyValue); + + } + + } + + } + + } + + intPropertyLen = PropertySeg2.Len(); + SplitPoints.clear(); + SplitLength.clear(); + intSplitsFound = 0; + intSplitSize = 0; + intPrevValue = 0; + + CaptureString(&PropertySeg2, FALSE); + + for (int i = 0; i <= intPropertyLen; i++){ + + intSplitSize++; + + if (PropertySeg2.Mid(i, 1) == wxT(";")){ + + intSplitsFound++; + SplitPoints.insert(std::make_pair(intSplitsFound, (i + 1))); + + if (intSplitsFound == 6){ + + SplitLength.insert(std::make_pair(intSplitsFound, (intSplitSize - 1))); + break; + + } else { + + SplitLength.insert(std::make_pair(intSplitsFound, (intSplitSize - 1))); + + } + + intSplitSize = 0; + + } + + } + + wxString wxSPhotoURI; + wxString wxSPhotoMIME; + wxString wxSPhotoEncoding; + wxString wxSPhotoData; + std::string base64enc; + + if (intSplitsFound == 0){ + + } else { + + std::map::iterator striter; + + striter = SplitLength.find(1); + + wxStringTokenizer wSTDataType(PropertySeg2.Mid(0, striter->second), wxT(":")); + + while (wSTDataType.HasMoreTokens() == TRUE){ + + wxSPhotoURI = wSTDataType.GetNextToken(); + wxSPhotoMIME = wSTDataType.GetNextToken(); + break; + + } + + wxStringTokenizer wSTDataInfo(PropertySeg2.Mid((striter->second + 1)), wxT(",")); + + while (wSTDataInfo.HasMoreTokens() == TRUE){ + + wxSPhotoEncoding = wSTDataInfo.GetNextToken(); + wxSPhotoData = wSTDataInfo.GetNextToken(); + base64enc = wxSPhotoData.mb_str(); + break; + + } + + } + + // Add the data to the General/Home/Work address variables. + + LogosList.insert(std::make_pair(*LogoCount, base64enc)); + LogosListPictureType.insert(std::make_pair(*LogoCount, wxSPhotoMIME)); + LogosListPicEncType.insert(std::make_pair(*LogoCount, wxSPhotoEncoding)); + + switch(PropType){ + case PROPERTY_NONE: + break; + case PROPERTY_HOME: + LogosListType.insert(std::make_pair(*LogoCount, "home")); + break; + case PROPERTY_WORK: + LogosListType.insert(std::make_pair(*LogoCount, "work")); + break; + } + + if (!PropertyTokens.IsEmpty()){ + + LogosListTokens.insert(std::make_pair(*LogoCount, PropertyTokens)); + + } + +} + +void ContactDataObject::ProcessSound(wxString PropertySeg1, wxString PropertySeg2, int *SoundCount){ + + size_t intPropertyLen = PropertySeg1.Len(); + std::map 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 = 7; + int intPref = 0; + int intType = 0; + + SplitValues(&PropertySeg1, &SplitPoints, &SplitLength, intPrevValue); + + intPrevValue = 6; + + PropertyType PropType = PROPERTY_NONE; + + // Look for type before continuing. + + CheckType(&PropertySeg1, &SplitPoints, &SplitLength, &intPrevValue, &PropType); + + intPrevValue = 6; + + for (std::map::iterator intiter = SplitPoints.begin(); + intiter != SplitPoints.end(); ++intiter){ + + SLiter = SplitLength.find(intiter->first); + + PropertyData = PropertySeg1.Mid(intPrevValue, (SLiter->second)); + + wxStringTokenizer PropertyElement (PropertyData, wxT("=")); + PropertyName = PropertyElement.GetNextToken(); + PropertyValue = PropertyElement.GetNextToken(); + + intPrevValue = intiter->second; + + // Process properties. + + size_t intPropertyValueLen = PropertyValue.Len(); + + if (PropertyValue.Mid((intPropertyValueLen - 1), 1) == wxT("\"")){ + + PropertyValue.Trim(); + PropertyValue.RemoveLast(); + + } + + if (PropertyValue.Mid(0, 1) == wxT("\"")){ + + PropertyValue.Remove(0, 1); + + } + + CaptureString(&PropertyValue, FALSE); + + if (PropertyName == wxT("ALTID")){ + + SoundsListAltID.erase(*SoundCount); + SoundsListAltID.insert(std::make_pair(*SoundCount, PropertyValue)); + + } else if (PropertyName == wxT("PID")){ + + SoundsListPID.erase(*SoundCount); + SoundsListPID.insert(std::make_pair(*SoundCount, PropertyValue)); + + } else if (PropertyName == wxT("PREF")){ + + 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)); + + } + + } else if (PropertyName == wxT("MEDIATYPE")){ + + SoundsListMediatype.erase(*SoundCount); + SoundsListMediatype.insert(std::make_pair(*SoundCount, PropertyValue)); + + } else if (PropertyName == wxT("LANGUAGE")){ + + SoundsListLanguage.erase(*SoundCount); + SoundsListLanguage.insert(std::make_pair(*SoundCount, PropertyValue)); + + } else { + + // Something else we don't know about so append + // to the tokens variable. + + if (!PropertyName.IsEmpty() && !PropertyValue.IsEmpty() && PropertyName != wxT("TYPE")){ + + if (FirstToken == TRUE){ + + PropertyTokens.Append(PropertyName + wxT("=") + PropertyValue); + FirstToken = FALSE; + + } else { + + PropertyTokens.Append(wxT(";") + PropertyName + wxT("=") + PropertyValue); + + } + + } + + } + + } + + intPropertyLen = PropertySeg2.Len(); + SplitPoints.clear(); + SplitLength.clear(); + intSplitsFound = 0; + intSplitSize = 0; + intPrevValue = 0; + + CaptureString(&PropertySeg2, FALSE); + + for (int i = 0; i <= intPropertyLen; i++){ + + intSplitSize++; + + if (PropertySeg2.Mid(i, 1) == wxT(";")){ + + intSplitsFound++; + SplitPoints.insert(std::make_pair(intSplitsFound, (i + 1))); + + if (intSplitsFound == 6){ + + SplitLength.insert(std::make_pair(intSplitsFound, (intSplitSize - 1))); + break; + + } else { + + SplitLength.insert(std::make_pair(intSplitsFound, (intSplitSize - 1))); + + } + + intSplitSize = 0; + + } + + } + + wxString wxSSoundURI; + wxString wxSSoundMIME; + wxString wxSSoundEncoding; + wxString wxSSoundData; + std::string base64enc; + + if (intSplitsFound == 0){ + + } else { + + std::map::iterator striter; + + striter = SplitLength.find(1); + + wxStringTokenizer wSTDataType(PropertySeg2.Mid(0, striter->second), wxT(":")); + + while (wSTDataType.HasMoreTokens() == TRUE){ + + wxSSoundURI = wSTDataType.GetNextToken(); + wxSSoundMIME = wSTDataType.GetNextToken(); + break; + + } + + wxStringTokenizer wSTDataInfo(PropertySeg2.Mid((striter->second + 1)), wxT(",")); + + while (wSTDataInfo.HasMoreTokens() == TRUE){ + + wxSSoundEncoding = wSTDataInfo.GetNextToken(); + wxSSoundData = wSTDataInfo.GetNextToken(); + base64enc = wxSSoundData.mb_str(); + break; + + } + + } + + // Add the data to the General/Home/Work address variables. + + switch(PropType){ + case PROPERTY_NONE: + break; + case PROPERTY_HOME: + SoundsListType.insert(std::make_pair(*SoundCount, "home")); + break; + case PROPERTY_WORK: + SoundsListType.insert(std::make_pair(*SoundCount, "work")); + break; + } + + SoundsList.insert(std::make_pair(*SoundCount, base64enc)); + SoundsListAudioEncType.insert(std::make_pair(*SoundCount, wxSSoundEncoding)); + SoundsListAudioType.insert(std::make_pair(*SoundCount, wxSSoundMIME)); + + if (!PropertyTokens.IsEmpty()){ + + SoundsListTokens.insert(std::make_pair(*SoundCount, PropertyTokens)); + } - + } -void ContactDataObject::ProcessNote(wxString PropertySeg1, wxString PropertySeg2, int *NoteCount){ +void ContactDataObject::ProcessCalendarURI(wxString PropertySeg1, wxString PropertySeg2, int *CalURICount){ + size_t intPropertyLen = PropertySeg1.Len(); std::map SplitPoints; std::map SplitLength; std::map::iterator SLiter; @@ -3580,65 +5170,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 = 8; int intPref = 0; int intType = 0; - long ListCtrlIndex; 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); - - // 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 = 7; + for (std::map::iterator intiter = SplitPoints.begin(); intiter != SplitPoints.end(); ++intiter){ @@ -3667,22 +5216,22 @@ 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)); + + CalendarListAltID.erase(*CalURICount); + CalendarListAltID.insert(std::make_pair(*CalURICount, PropertyValue)); } else if (PropertyName == wxT("PID")){ - NoteListPID->erase(*NoteCount); - NoteListPID->insert(std::make_pair(*NoteCount, PropertyValue)); + CalendarListPID.erase(*CalURICount); + CalendarListPID.insert(std::make_pair(*CalURICount, PropertyValue)); } else if (PropertyName == wxT("PREF")){ - + int PriorityNumber = 0; bool ValidNumber = TRUE; @@ -3696,56 +5245,75 @@ void ContactDataObject::ProcessNote(wxString PropertySeg1, wxString PropertySeg2 if (ValidNumber == TRUE){ - NoteListPref->erase(*NoteCount); - NoteListPref->insert(std::make_pair(*NoteCount, PriorityNumber)); + CalendarListPref.erase(*CalURICount); + CalendarListPref.insert(std::make_pair(*CalURICount, PriorityNumber)); } - - } else if (PropertyName == wxT("LANGUAGE")){ - NoteListLanguage->erase(*NoteCount); - NoteListLanguage->insert(std::make_pair(*NoteCount, PropertyValue)); + } else if (PropertyName == wxT("MEDIATYPE")){ + CalendarListMediatype.erase(*CalURICount); + CalendarListMediatype.insert(std::make_pair(*CalURICount, PropertyValue)); + } else { // Something else we don't know about so append // to the tokens variable. - + if (!PropertyName.IsEmpty() && !PropertyValue.IsEmpty() && PropertyName != wxT("TYPE")){ - - if (FirstToken == TRUE){ + if (FirstToken == TRUE){ + PropertyTokens.Append(PropertyName + wxT("=") + PropertyValue); FirstToken = FALSE; - + } else { - + PropertyTokens.Append(wxT(";") + PropertyName + wxT("=") + PropertyValue); - + } - + } } - } + } - // Add the data to the General/Home/Work address variables. + intPropertyLen = PropertySeg2.Len(); + SplitPoints.clear(); + SplitLength.clear(); + intSplitsFound = 0; + intSplitSize = 0; + intPrevValue = 0; CaptureString(&PropertySeg2, FALSE); - - NoteList->insert(std::make_pair(*NoteCount, PropertySeg2)); + + // Add the data to the General/Home/Work address variables. + + switch(PropType){ + case PROPERTY_NONE: + break; + case PROPERTY_HOME: + CalendarListType.insert(std::make_pair(*CalURICount, "home")); + break; + case PROPERTY_WORK: + CalendarListType.insert(std::make_pair(*CalURICount, "work")); + break; + } + + CalendarList.insert(std::make_pair(*CalURICount, PropertySeg2)); if (!PropertyTokens.IsEmpty()){ - NoteListTokens->insert(std::make_pair(*NoteCount, PropertyTokens)); - + CalendarListTokens.insert(std::make_pair(*CalURICount, PropertyTokens)); + } } -void ContactDataObject::ProcessCategory(wxString PropertySeg1, wxString PropertySeg2, int *CategoryCount){ +void ContactDataObject::ProcessCalendarAddressURI(wxString PropertySeg1, wxString PropertySeg2, int *CalAdrURICount){ + size_t intPropertyLen = PropertySeg1.Len(); std::map SplitPoints; std::map SplitLength; std::map::iterator SLiter; @@ -3754,36 +5322,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 = 8; int intPref = 0; int intType = 0; - long ListCtrlIndex; SplitValues(&PropertySeg1, &SplitPoints, &SplitLength, intPrevValue); - intPrevValue = 11; + intPrevValue = 7; PropertyType PropType = PROPERTY_NONE; - - // Look for type before continuing. + // 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 = 7; + for (std::map::iterator intiter = SplitPoints.begin(); intiter != SplitPoints.end(); ++intiter){ @@ -3812,22 +5368,22 @@ 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)); + + CalendarRequestListAltID.erase(*CalAdrURICount); + CalendarRequestListAltID.insert(std::make_pair(*CalAdrURICount, PropertyValue)); } else if (PropertyName == wxT("PID")){ - CategoriesListPID.erase(*CategoryCount); - CategoriesListPID.insert(std::make_pair(*CategoryCount, PropertyValue)); + CalendarRequestListPID.erase(*CalAdrURICount); + CalendarRequestListPID.insert(std::make_pair(*CalAdrURICount, PropertyValue)); } else if (PropertyName == wxT("PREF")){ - + int PriorityNumber = 0; bool ValidNumber = TRUE; @@ -3841,210 +5397,225 @@ void ContactDataObject::ProcessCategory(wxString PropertySeg1, wxString Property if (ValidNumber == TRUE){ - CategoriesListPref.erase(*CategoryCount); - CategoriesListPref.insert(std::make_pair(*CategoryCount, PriorityNumber)); + CalendarRequestListPref.erase(*CalAdrURICount); + CalendarRequestListPref.insert(std::make_pair(*CalAdrURICount, PriorityNumber)); } - - } else if (PropertyName == wxT("LANGUAGE")){ - CategoriesListLanguage.erase(*CategoryCount); - CategoriesListLanguage.insert(std::make_pair(*CategoryCount, PropertyValue)); + } 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){ + 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(); + intSplitsFound = 0; + intSplitSize = 0; 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("\\")){ + CaptureString(&PropertySeg2, FALSE); - if (AfterFirstToken == TRUE){ + // Add the data to the General/Home/Work address variables. - SplitPoints.insert(std::make_pair(intSplitsFound, (i - intSplitSize + 1))); - SplitLength.insert(std::make_pair(intSplitsFound, (intSplitSize - 2))); - - } else { - - SplitPoints.insert(std::make_pair(intSplitsFound, 0)); - SplitLength.insert(std::make_pair(intSplitsFound, (intSplitSize - 2))); - AfterFirstToken = TRUE; - - } - - intSplitsFound++; - intSplitSeek = i; - intSplitSize = 0; - - } - + switch(PropType){ + case PROPERTY_NONE: + break; + case PROPERTY_HOME: + CalendarRequestListType.insert(std::make_pair(*CalAdrURICount, "home")); + break; + case PROPERTY_WORK: + CalendarRequestListType.insert(std::make_pair(*CalAdrURICount, "work")); + break; } - if (SplitPoints.size() > 0){ + CalendarRequestList.insert(std::make_pair(*CalAdrURICount, PropertySeg2)); - SplitPoints.insert(std::make_pair(intSplitsFound, (intSplitSeek + 1))); - SplitLength.insert(std::make_pair(intSplitsFound, intSplitSize)); + if (!PropertyTokens.IsEmpty()){ - } + CalendarRequestListTokens.insert(std::make_pair(*CalAdrURICount, PropertyTokens)); - if (SplitPoints.size() == 0){ + } + +} + +void ContactDataObject::ProcessCalendarFreeBusy(wxString PropertySeg1, wxString PropertySeg2, int *FreeBusyAddressCount){ + + 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 = 7; + int intPref = 0; + int intType = 0; - CategoriesList.insert(std::make_pair(*CategoryCount, PropertySeg2)); + SplitValues(&PropertySeg1, &SplitPoints, &SplitLength, intPrevValue); - if (!PropertyTokens.IsEmpty()){ - - CategoriesListTokens.insert(std::make_pair(*CategoryCount, PropertyTokens)); - - } + intPrevValue = 6; - } + PropertyType PropType = PROPERTY_NONE; + // Look for type before continuing. + + CheckType(&PropertySeg1, &SplitPoints, &SplitLength, &intPrevValue, &PropType); + + intPrevValue = 6; + 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)); + PropertyData = PropertySeg1.Mid(intPrevValue, (SLiter->second)); - // 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); + wxStringTokenizer PropertyElement (PropertyData, wxT("=")); + PropertyName = PropertyElement.GetNextToken(); + PropertyValue = PropertyElement.GetNextToken(); - if (FirstCategoryProcessed == TRUE){ + intPrevValue = intiter->second; - FirstCategoryProcessed = FALSE; - - CategoriesList.insert(std::make_pair(*CategoryCount, PropertyData)); - - if (!PropertyTokens.IsEmpty()){ + // Process properties. - CategoriesListTokens.insert(std::make_pair(*CategoryCount, PropertyTokens)); + size_t intPropertyValueLen = PropertyValue.Len(); - } + if (PropertyValue.Mid((intPropertyValueLen - 1), 1) == wxT("\"")){ - continue; - - } else { - - (*CategoryCount)++; + PropertyValue.Trim(); + PropertyValue.RemoveLast(); - 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)); + } - } + if (PropertyValue.Mid(0, 1) == wxT("\"")){ + + PropertyValue.Remove(0, 1); + + } - // Check if ALTID was used. + CaptureString(&PropertyValue, FALSE); - if (CategoriesListAltID.find(intOrigCatCount) != CategoriesListAltID.end()){ + if (PropertyName == wxT("ALTID")){ + + FreeBusyListAltID.erase(*FreeBusyAddressCount); + FreeBusyListAltID.insert(std::make_pair(*FreeBusyAddressCount, PropertyValue)); - CategoriesListAltID.insert(std::make_pair(*CategoryCount, CategoriesListAltID.find(intOrigCatCount)->second)); + } else if (PropertyName == wxT("PID")){ + + 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){ + + FreeBusyListPref.erase(*FreeBusyAddressCount); + FreeBusyListPref.insert(std::make_pair(*FreeBusyAddressCount, PriorityNumber)); + + } - // Check if PID was used. + } else if (PropertyName == wxT("MEDIATYPE")){ - if (CategoriesListPID.find(intOrigCatCount) != CategoriesListPID.end()){ + FreeBusyListMediatype.erase(*FreeBusyAddressCount); + FreeBusyListMediatype.insert(std::make_pair(*FreeBusyAddressCount, PropertyValue)); + + } else { - CategoriesListPID.insert(std::make_pair(*CategoryCount, CategoriesListPID.find(intOrigCatCount)->second)); + // 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); + + } + + } } - // 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. + 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: - CategoriesListType.insert(std::make_pair(*CategoryCount, "home")); - break; - case PROPERTY_WORK: - CategoriesListType.insert(std::make_pair(*CategoryCount, "work")); - break; - } + switch(PropType){ + case PROPERTY_NONE: + break; + case PROPERTY_HOME: + FreeBusyListType.insert(std::make_pair(*FreeBusyAddressCount, "home")); + break; + case PROPERTY_WORK: + FreeBusyListType.insert(std::make_pair(*FreeBusyAddressCount, "work")); + break; + } + + FreeBusyList.insert(std::make_pair(*FreeBusyAddressCount, PropertySeg2)); + + if (!PropertyTokens.IsEmpty()){ + + FreeBusyListTokens.insert(std::make_pair(*FreeBusyAddressCount, PropertyTokens)); } } -void ContactDataObject::ProcessPhoto(wxString PropertySeg1, wxString PropertySeg2, int *PhotoCount){ +void ContactDataObject::ProcessKey(wxString PropertySeg1, wxString PropertySeg2, int *KeyCount){ size_t intPropertyLen = PropertySeg1.Len(); std::map SplitPoints; @@ -4057,22 +5628,22 @@ void ContactDataObject::ProcessPhoto(wxString PropertySeg1, wxString PropertySeg bool FirstToken = TRUE; int intSplitsFound = 0; int intSplitSize = 0; - 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; - - // Look for type before continuing. + // Look for type before continuing. + CheckType(&PropertySeg1, &SplitPoints, &SplitLength, &intPrevValue, &PropType); - intPrevValue = 6; + intPrevValue = 4; for (std::map::iterator intiter = SplitPoints.begin(); intiter != SplitPoints.end(); ++intiter){ @@ -4102,19 +5673,17 @@ 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)); + KeyListAltID.erase(*KeyCount); + KeyListAltID.insert(std::make_pair(*KeyCount, PropertyValue)); } else if (PropertyName == wxT("PID")){ - PicturesListPID.erase(*PhotoCount); - PicturesListPID.insert(std::make_pair(*PhotoCount, PropertyValue)); + KeyListPID.erase(*KeyCount); + KeyListPID.insert(std::make_pair(*KeyCount, PropertyValue)); } else if (PropertyName == wxT("PREF")){ @@ -4131,16 +5700,11 @@ void ContactDataObject::ProcessPhoto(wxString PropertySeg1, wxString PropertySeg if (ValidNumber == TRUE){ - PicturesListPref.erase(*PhotoCount); - PicturesListPref.insert(std::make_pair(*PhotoCount, PriorityNumber)); + KeyListPref.erase(*KeyCount); + KeyListPref.insert(std::make_pair(*KeyCount, PriorityNumber)); } - } 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 @@ -4163,7 +5727,7 @@ void ContactDataObject::ProcessPhoto(wxString PropertySeg1, wxString PropertySeg } - } + } intPropertyLen = PropertySeg2.Len(); SplitPoints.clear(); @@ -4172,13 +5736,11 @@ void ContactDataObject::ProcessPhoto(wxString PropertySeg1, wxString PropertySeg intSplitSize = 0; intPrevValue = 0; - CaptureString(&PropertySeg2, FALSE); - for (int i = 0; i <= intPropertyLen; i++){ intSplitSize++; - if (PropertySeg2.Mid(i, 1) == wxT(";")){ + if (PropertySeg2.Mid(i, 1) == wxT(";") && PropertySeg2.Mid((i - 1), 1) != wxT("\\")){ intSplitsFound++; SplitPoints.insert(std::make_pair(intSplitsFound, (i + 1))); @@ -4200,10 +5762,10 @@ void ContactDataObject::ProcessPhoto(wxString PropertySeg1, wxString PropertySeg } - wxString wxSPhotoURI; - wxString wxSPhotoMIME; - wxString wxSPhotoEncoding; - wxString wxSPhotoData; + wxString wxSKeyURI; + wxString wxSKeyMIME; + wxString wxSKeyEncoding; + wxString wxSKeyData; std::string base64enc; if (intSplitsFound == 0){ @@ -4218,20 +5780,23 @@ void ContactDataObject::ProcessPhoto(wxString PropertySeg1, wxString PropertySeg while (wSTDataType.HasMoreTokens() == TRUE){ - wxSPhotoURI = wSTDataType.GetNextToken(); - wxSPhotoMIME = wSTDataType.GetNextToken(); + wxSKeyURI = wSTDataType.GetNextToken(); + wxSKeyMIME = wSTDataType.GetNextToken(); break; } - wxStringTokenizer wSTDataInfo(PropertySeg2.Mid((striter->second + 1)), wxT(",")); - - while (wSTDataInfo.HasMoreTokens() == TRUE){ + if (wxSKeyURI == wxT("data")){ - wxSPhotoEncoding = wSTDataInfo.GetNextToken(); - wxSPhotoData = wSTDataInfo.GetNextToken(); - base64enc = wxSPhotoData.mb_str(); - break; + wxStringTokenizer wSTDataInfo(PropertySeg2.Mid((striter->second + 1)), wxT(",")); + + while (wSTDataInfo.HasMoreTokens() == TRUE){ + + wxSKeyEncoding = wSTDataInfo.GetNextToken(); + wxSKeyData = wSTDataInfo.GetNextToken(); + break; + + } } @@ -4239,24 +5804,74 @@ 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)); + if (wxSKeyURI == wxT("data")){ + + KeyListDataEncType.erase(*KeyCount); + KeyListKeyType.erase(*KeyCount); + KeyListDataEncType.insert(std::make_pair(*KeyCount, wxSKeyEncoding)); + KeyListKeyType.insert(std::make_pair(*KeyCount, TRUE)); + + KeyList.erase(*KeyCount); + KeyList.insert(std::make_pair(*KeyCount, wxSKeyData)); - switch(PropType){ + } 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: - PicturesListType.insert(std::make_pair(*PhotoCount, "home")); + case PROPERTY_HOME: + KeyListType.insert(std::make_pair(*KeyCount, wxT("home"))); break; - case PROPERTY_WORK: - PicturesListType.insert(std::make_pair(*PhotoCount, "work")); + case PROPERTY_WORK: + KeyListType.insert(std::make_pair(*KeyCount, wxT("work"))); break; } - + if (!PropertyTokens.IsEmpty()){ - PicturesListTokens.insert(std::make_pair(*PhotoCount, PropertyTokens)); + KeyListTokens.insert(std::make_pair(*KeyCount, PropertyTokens)); + + } + +} + +void ContactDataObject::ProcessVendor(wxString PropertySeg1, wxString PropertySeg2, int *VendorCount){ + + // Split the Vendor three ways. + + wxStringTokenizer wSTVendorDetails(PropertySeg1, wxT("-")); + + wxString wxSVNDID; + wxString wxSVNDPropName; + long ListCtrlIndex; + + while (wSTVendorDetails.HasMoreTokens() == TRUE){ + + wSTVendorDetails.GetNextToken(); + wxSVNDID = wSTVendorDetails.GetNextToken(); + wxSVNDPropName = wSTVendorDetails.GetNextToken(); + break; + + } + + if (!wxSVNDID.IsEmpty() && !wxSVNDPropName.IsEmpty()){ + + // Add the data to the vendor variables. + + VendorList.erase(*VendorCount); + VendorListPEN.erase(*VendorCount); + VendorListElement.erase(*VendorCount); + + VendorList.insert(std::make_pair(*VendorCount, PropertySeg2)); + VendorListPEN.insert(std::make_pair(*VendorCount, wxSVNDID)); + VendorListElement.insert(std::make_pair(*VendorCount, wxSVNDPropName)); }