X-Git-Url: http://Server1/repobrowser/?a=blobdiff_plain;f=source%2Fcontacteditor%2FContactDataObject.cpp;h=245341be5d81c0bc64588103f7491b7e59c949e2;hb=ad76a9933d9cfcee0abe970c996a944b56e3caf8;hp=0b70e2825d94375f4a2a5d1ba98361b4240386bc;hpb=e156db40eb817b3dbe13737edc3f625a2db30fa3;p=xestiaab%2F.git diff --git a/source/contacteditor/ContactDataObject.cpp b/source/contacteditor/ContactDataObject.cpp index 0b70e28..245341b 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,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){ @@ -494,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; @@ -587,6 +680,7 @@ void ContactDataObject::ProcessN(wxString PropertySeg1, wxString PropertySeg2){ wxString PropertyTokens; std::map::iterator SLiter; bool FirstToken = TRUE; + bool PropertyMatched = FALSE; for (std::map::iterator intiter = SplitPoints.begin(); intiter != SplitPoints.end(); ++intiter){ @@ -602,41 +696,256 @@ void ContactDataObject::ProcessN(wxString PropertySeg1, wxString PropertySeg2){ intPrevValue = intiter->second; CaptureString(&PropertyValue, FALSE); + + ProcessStringValue(&PropertyName, "ALTID", &XMLListAltID, &PropertyValue, XMLCount, &PropertyMatched); - if (PropertyName == wxT("ALTID")){ - - NameAltID = PropertyValue; - - } else if (PropertyName == wxT("LANGUAGE")){ - - NameLanguage = PropertyValue; - - } else if (PropertyName == wxT("SORT-AS")){ + if (PropertyMatched == TRUE){ - if (PropertyValue.Left(1) == wxT("\"") && PropertyValue.Right(1) == wxT("\"") && - PropertyValue.Len() >= 3){ - NameDisplayAs = PropertyValue.Mid(1, (PropertyValue.Len() - 2)); - } + PropertyMatched = FALSE; + continue; - } else if (!PropertyName.IsEmpty() && !PropertyValue.IsEmpty()){ - - if (FirstToken == TRUE){ - - PropertyTokens.Append(PropertyName + wxT("=") + PropertyValue); - FirstToken = FALSE; - - } else { - - PropertyTokens.Append(wxT(";") + PropertyName + wxT("=") + 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; + bool PropertyMatched = FALSE; + + 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); + + ProcessStringValue(&PropertyName, "ALTID", &GroupsListAltID, &PropertyValue, GroupCount, &PropertyMatched); + ProcessStringValue(&PropertyName, "PID", &GroupsListPID, &PropertyValue, GroupCount, &PropertyMatched); + ProcessStringValue(&PropertyName, "MEDIATYPE", &GroupsListMediaType, &PropertyValue, GroupCount, &PropertyMatched); + ProcessIntegerValue(&PropertyName, "PREF", &GroupsListPref, &PropertyValue, GroupCount, &PropertyMatched); + + if (PropertyMatched == TRUE){ + + PropertyMatched = FALSE; + continue; + + } + + if (!PropertyName.IsEmpty() && !PropertyValue.IsEmpty()){ + + if (FirstToken == TRUE){ + + PropertyTokens.Append(PropertyName + wxT("=") + PropertyValue); + FirstToken = FALSE; + + } else { + + PropertyTokens.Append(wxT(";") + PropertyName + wxT("=") + PropertyValue); + + } + + } + + } + + GroupsList.insert(std::make_pair(*GroupCount, PropertySeg2)); + + if (!PropertyTokens.IsEmpty()){ + + GroupsListTokens.insert(std::make_pair(*GroupCount, PropertyTokens)); + + } + + +} + +void ContactDataObject::ProcessFN(wxString PropertySeg1, wxString PropertySeg2, int *FNCount){ + + std::map 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; + bool PropertyMatched = FALSE; + + 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)); + + } + + PropertyMatched = TRUE; + + } + + ProcessStringValue(&PropertyName, "ALTID", &FullNamesListAltID, &PropertyValue, FNCount, &PropertyMatched); + ProcessStringValue(&PropertyName, "PID", &FullNamesListPID, &PropertyValue, FNCount, &PropertyMatched); + ProcessStringValue(&PropertyName, "LANGUAGE", &FullNamesListLanguage, &PropertyValue, FNCount, &PropertyMatched); + ProcessIntegerValue(&PropertyName, "PREF", &FullNamesListPref, &PropertyValue, FNCount, &PropertyMatched); + + if (PropertyMatched == TRUE){ + + PropertyMatched = FALSE; + continue; + + } + + if (!PropertyName.IsEmpty() && !PropertyValue.IsEmpty()){ + + if (FirstToken == TRUE){ + + PropertyTokens.Append(PropertyName + wxT("=") + PropertyValue); + FirstToken = FALSE; + + } else { + + PropertyTokens.Append(wxT(";") + PropertyName + wxT("=") + PropertyValue); + + } + + } + + } + + FullNamesList.insert(std::make_pair(*FNCount, PropertySeg2)); + + if (!PropertyTokens.IsEmpty()){ + + FullNamesListTokens.insert(std::make_pair(*FNCount, PropertyTokens)); + + } + +} + +void ContactDataObject::ProcessN(wxString PropertySeg1, wxString PropertySeg2){ + + std::map 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; + + } else { + + PropertyTokens.Append(wxT(";") + PropertyName + wxT("=") + PropertyValue); + + } + + } + } - // Split the name data. - + // Split the name data. + int intSplitSeek = 0; int intSplitsFound = 0; int intSplitSize = 0; @@ -723,35 +1032,102 @@ 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 = 9; + intPrevValue = 13; + + for (std::map::iterator intiter = SplitPoints.begin(); + intiter != SplitPoints.end(); ++intiter){ - std::map *NicknamesList = NULL; - std::map *NicknamesListType = NULL; - std::map *NicknamesListLanguage = NULL; - std::map *NicknamesListAltID = NULL; - std::map *NicknamesListPID = NULL; - std::map *NicknamesListTokens = NULL; - std::map *NicknamesListPref = NULL; + SLiter = SplitLength.find(intiter->first); - switch(PropType){ + PropertyData = PropertySeg1.Mid(intPrevValue, (SLiter->second)); + + wxStringTokenizer PropertyElement (PropertyData, wxT("=")); + PropertyName = PropertyElement.GetNextToken(); + PropertyValue = PropertyElement.GetNextToken(); + + intPrevValue = intiter->second; + + // Process properties. + + CaptureString(&PropertyValue, FALSE); + + if (!PropertyName.IsEmpty() && !PropertyValue.IsEmpty()){ + + if (FirstToken == TRUE){ + + PropertyTokens.Append(PropertyName + wxT("=") + PropertyValue); + FirstToken = FALSE; + + } else { + + PropertyTokens.Append(wxT(";") + PropertyName + wxT("=") + PropertyValue); + + } + + } + + } + + CaptureString(&PropertySeg2, FALSE); + + ClientPIDList.insert(std::make_pair(*ClientPIDCount, PropertySeg2)); + + if (!PropertyTokens.IsEmpty()){ + + ClientPIDListTokens.insert(std::make_pair(*ClientPIDCount, PropertyTokens)); + + } + +} + +void ContactDataObject::ProcessNickname(wxString PropertySeg1, wxString PropertySeg2, int *NicknameCount){ + + std::map 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; + std::map *NicknamesListTokens = NULL; + std::map *NicknamesListPref = NULL; + + switch(PropType){ case PROPERTY_NONE: NicknamesList = &GeneralNicknamesList; NicknamesListType = &GeneralNicknamesListType; @@ -787,6 +1163,7 @@ void ContactDataObject::ProcessNickname(wxString PropertySeg1, wxString Property wxString PropertyValue; wxString PropertyTokens; bool FirstToken = TRUE; + bool PropertyMatched = FALSE; for (std::map::iterator intiter = SplitPoints.begin(); intiter != SplitPoints.end(); ++intiter){ @@ -803,61 +1180,31 @@ void ContactDataObject::ProcessNickname(wxString PropertySeg1, wxString Property CaptureString(&PropertyValue, FALSE); - if (PropertyName == wxT("ALTID")){ - - NicknamesListAltID->erase(*NicknameCount); - NicknamesListAltID->insert(std::make_pair(*NicknameCount, PropertyValue)); + ProcessStringValue(&PropertyName, "ALTID", NicknamesListAltID, &PropertyValue, NicknameCount, &PropertyMatched); + ProcessStringValue(&PropertyName, "PID", NicknamesListPID, &PropertyValue, NicknameCount, &PropertyMatched); + ProcessStringValue(&PropertyName, "LANGUAGE", NicknamesListLanguage, &PropertyValue, NicknameCount, &PropertyMatched); + ProcessIntegerValue(&PropertyName, "PREF", NicknamesListPref, &PropertyValue, NicknameCount, &PropertyMatched); - } else if (PropertyName == wxT("PID")){ - - NicknamesListPID->erase(*NicknameCount); - NicknamesListPID->insert(std::make_pair(*NicknameCount, PropertyValue)); - - } else if (PropertyName == wxT("PREF")){ - - int PriorityNumber = 0; - bool ValidNumber = TRUE; - - try{ - PriorityNumber = std::stoi(PropertyValue.ToStdString()); - } - - catch(std::invalid_argument &e){ - ValidNumber = FALSE; - } - - if (ValidNumber == TRUE){ - - NicknamesListPref->erase(*NicknameCount); - NicknamesListPref->insert(std::make_pair(*NicknameCount, PriorityNumber)); - - } + if (PropertyMatched == TRUE){ - } else if (PropertyName == wxT("LANGUAGE")){ - - NicknamesListLanguage->erase(*NicknameCount); - NicknamesListLanguage->insert(std::make_pair(*NicknameCount, PropertyValue)); - - } else { + PropertyMatched = FALSE; + continue; - // Something else we don't know about so append - // to the tokens variable. + } - if (!PropertyName.IsEmpty() && !PropertyValue.IsEmpty() && PropertyName != wxT("TYPE")){ + if (!PropertyName.IsEmpty() && !PropertyValue.IsEmpty() && PropertyName != wxT("TYPE")){ + + if (FirstToken == TRUE){ - if (FirstToken == TRUE){ - - PropertyTokens.Append(PropertyName + wxT("=") + PropertyValue); - FirstToken = FALSE; - - } else { - - PropertyTokens.Append(wxT(";") + PropertyName + wxT("=") + PropertyValue); - - } + PropertyTokens.Append(PropertyName + wxT("=") + PropertyValue); + FirstToken = FALSE; - } + } else { + PropertyTokens.Append(wxT(";") + PropertyName + wxT("=") + PropertyValue); + + } + } } @@ -1278,6 +1625,7 @@ void ContactDataObject::ProcessTimeZone(wxString PropertySeg1, wxString Property wxString PropertyValue; wxString PropertyTokens; bool FirstToken = TRUE; + bool PropertyMatched = FALSE; for (std::map::iterator intiter = SplitPoints.begin(); intiter != SplitPoints.end(); ++intiter){ @@ -1294,61 +1642,31 @@ void ContactDataObject::ProcessTimeZone(wxString PropertySeg1, wxString Property CaptureString(&PropertyValue, FALSE); - if (PropertyName == wxT("ALTID")){ - - TZListAltID->erase(*TimeZoneCount); - TZListAltID->insert(std::make_pair(*TimeZoneCount, PropertyValue)); + ProcessStringValue(&PropertyName, "ALTID", TZListAltID, &PropertyValue, TimeZoneCount, &PropertyMatched); + ProcessStringValue(&PropertyName, "PID", TZListPID, &PropertyValue, TimeZoneCount, &PropertyMatched); + ProcessStringValue(&PropertyName, "MEDIATYPE", TZListMediatype, &PropertyValue, TimeZoneCount, &PropertyMatched); + ProcessIntegerValue(&PropertyName, "PREF", TZListPref, &PropertyValue, TimeZoneCount, &PropertyMatched); - } else if (PropertyName == wxT("PID")){ - - TZListPID->erase(*TimeZoneCount); - TZListPID->insert(std::make_pair(*TimeZoneCount, PropertyValue)); - - } else if (PropertyName == wxT("PREF")){ - - int PriorityNumber = 0; - bool ValidNumber = TRUE; - - try{ - PriorityNumber = std::stoi(PropertyValue.ToStdString()); - } - - catch(std::invalid_argument &e){ - ValidNumber = FALSE; - } - - if (ValidNumber == TRUE){ - - TZListPref->erase(*TimeZoneCount); - TZListPref->insert(std::make_pair(*TimeZoneCount, PriorityNumber)); - - } + if (PropertyMatched == TRUE){ - } else if (PropertyName == wxT("MEDIATYPE")){ - - TZListMediatype->erase(*TimeZoneCount); - TZListMediatype->insert(std::make_pair(*TimeZoneCount, PropertyValue)); + PropertyMatched = FALSE; + continue; + + } - } else { + if (!PropertyName.IsEmpty() && !PropertyValue.IsEmpty() && PropertyName != wxT("TYPE")){ + + if (FirstToken == TRUE){ - // Something else we don't know about so append - // to the tokens variable. + PropertyTokens.Append(PropertyName + wxT("=") + PropertyValue); + FirstToken = FALSE; - if (!PropertyName.IsEmpty() && !PropertyValue.IsEmpty() && PropertyName != wxT("TYPE")){ + } else { - if (FirstToken == TRUE){ - - PropertyTokens.Append(PropertyName + wxT("=") + PropertyValue); - FirstToken = FALSE; - - } else { - - PropertyTokens.Append(wxT(";") + PropertyName + wxT("=") + PropertyValue); - - } + PropertyTokens.Append(wxT(";") + PropertyName + wxT("=") + PropertyValue); } - + } } @@ -1400,6 +1718,7 @@ void ContactDataObject::ProcessAddress(wxString PropertySeg1, wxString PropertyS int intPref = 0; int intType = 0; long ListCtrlIndex; + bool PropertyMatched = FALSE; SplitValues(&PropertySeg1, &SplitPoints, &SplitLength, intPrevValue); @@ -1502,78 +1821,35 @@ void ContactDataObject::ProcessAddress(wxString PropertySeg1, wxString PropertyS // Process properties. - if (PropertyName == wxT("LABEL")){ - - AddressListLabel->erase(*AddressCount); - AddressListLabel->insert(std::make_pair(*AddressCount, PropertyValue)); - - } else if (PropertyName == wxT("LANGUAGE")){ - - AddressListLang->erase(*AddressCount); - AddressListLang->insert(std::make_pair(*AddressCount, PropertyValue)); - - } else if (PropertyName == wxT("ALTID")){ - - AddressListAltID->erase(*AddressCount); - AddressListAltID->insert(std::make_pair(*AddressCount, PropertyValue)); - - } else if (PropertyName == wxT("PID")){ - - AddressListPID->erase(*AddressCount); - AddressListPID->insert(std::make_pair(*AddressCount, PropertyValue)); + ProcessStringValue(&PropertyName, "LABEL", AddressListLabel, &PropertyValue, AddressCount, &PropertyMatched); + ProcessStringValue(&PropertyName, "LANGUAGE", AddressListLang, &PropertyValue, AddressCount, &PropertyMatched); + ProcessStringValue(&PropertyName, "ALTID", AddressListAltID, &PropertyValue, AddressCount, &PropertyMatched); + ProcessStringValue(&PropertyName, "PID", AddressListPID, &PropertyValue, AddressCount, &PropertyMatched); + ProcessStringValue(&PropertyName, "GEO", AddressListGeo, &PropertyValue, AddressCount, &PropertyMatched); + ProcessStringValue(&PropertyName, "TZ", AddressListTimezone, &PropertyValue, AddressCount, &PropertyMatched); + ProcessStringValue(&PropertyName, "MEDIATYPE", AddressListMediatype, &PropertyValue, AddressCount, &PropertyMatched); + ProcessIntegerValue(&PropertyName, "PREF", AddressListPref, &PropertyValue, AddressCount, &PropertyMatched); - } else if (PropertyName == wxT("GEO")){ + if (PropertyMatched == TRUE){ - AddressListGeo->erase(*AddressCount); - AddressListGeo->insert(std::make_pair(*AddressCount, PropertyValue)); + PropertyMatched = FALSE; + continue; - } else if (PropertyName == wxT("TZ")){ - - AddressListTimezone->erase(*AddressCount); - AddressListTimezone->insert(std::make_pair(*AddressCount, PropertyValue)); + } - } else if (PropertyName == wxT("MEDIATYPE")){ - - AddressListMediatype->erase(*AddressCount); - AddressListMediatype->insert(std::make_pair(*AddressCount, PropertyValue)); + if (!PropertyName.IsEmpty() && !PropertyValue.IsEmpty() && PropertyName != wxT("TYPE")){ - } else if (PropertyName == wxT("PREF")){ - - int PriorityNumber = 0; - bool ValidNumber = TRUE; + if (FirstToken == TRUE){ - try{ - PriorityNumber = std::stoi(PropertyValue.ToStdString()); - } + PropertyTokens.Append(PropertyName + wxT("=") + PropertyValue); + FirstToken = FALSE; - catch(std::invalid_argument &e){ - ValidNumber = FALSE; - } - - if (ValidNumber == TRUE){ - - AddressListPref->erase(*AddressCount); - AddressListPref->insert(std::make_pair(*AddressCount, PriorityNumber)); - - } - - } else { - - if (!PropertyName.IsEmpty() && !PropertyValue.IsEmpty() && PropertyName != wxT("TYPE")){ + } else { - if (FirstToken == TRUE){ - - PropertyTokens.Append(PropertyName + wxT("=") + PropertyValue); - FirstToken = FALSE; - - } else { - - PropertyTokens.Append(wxT(";") + PropertyName + wxT("=") + PropertyValue); - - } + PropertyTokens.Append(wxT(";") + PropertyName + wxT("=") + PropertyValue); } - + } } @@ -1625,7 +1901,6 @@ void ContactDataObject::ProcessAddress(wxString PropertySeg1, wxString PropertyS SLiter = SplitLength.find(1); - //txtSurname->SetValue(ContactData.Convert(wxSPropertySeg2.Mid(0, SLiter->second), TRUE)); AddressPOBox = PropertySeg2.Mid(0, SLiter->second); intPrevValue = intiter->second; @@ -1636,7 +1911,6 @@ void ContactDataObject::ProcessAddress(wxString PropertySeg1, wxString PropertyS SLiter = SplitLength.find(2); AddressExtended = PropertySeg2.Mid(intPrevValue, SLiter->second); - //txtForename->SetValue(ContactData.Convert(wxSPropertySeg2.Mid(intPrevValue, SLiter->second), TRUE)); intPrevValue = intiter->second; } else if (intiter->first == 3){ @@ -1646,7 +1920,6 @@ void ContactDataObject::ProcessAddress(wxString PropertySeg1, wxString PropertyS SLiter = SplitLength.find(3); AddressStreet = PropertySeg2.Mid(intPrevValue, SLiter->second); - //txtOtherNames->SetValue(ContactData.Convert(wxSPropertySeg2.Mid(intPrevValue, SLiter->second), TRUE)); intPrevValue = intiter->second; } else if (intiter->first == 4){ @@ -1656,10 +1929,7 @@ void ContactDataObject::ProcessAddress(wxString PropertySeg1, wxString PropertyS SLiter = SplitLength.find(4); AddressLocality = PropertySeg2.Mid(intPrevValue, SLiter->second); - //txtTitle->SetValue(ContactData.Convert(wxSPropertySeg2.Mid(intPrevValue, SLiter->second), TRUE)); intPrevValue = intiter->second; - - //txtSuffix->SetValue(ContactData.Convert(wxSPropertySeg2.Mid(intPrevValue), TRUE)); } else if (intiter->first == 5){ @@ -1668,10 +1938,8 @@ void ContactDataObject::ProcessAddress(wxString PropertySeg1, wxString PropertyS SLiter = SplitLength.find(5); AddressRegion = PropertySeg2.Mid(intPrevValue, SLiter->second); - //txtTitle->SetValue(ContactData.Convert(wxSPropertySeg2.Mid(intPrevValue, SLiter->second), TRUE)); intPrevValue = intiter->second; - //txtSuffix->SetValue(ContactData.Convert(wxSPropertySeg2.Mid(intPrevValue), TRUE)); } else if (intiter->first == 6){ @@ -1680,14 +1948,12 @@ void ContactDataObject::ProcessAddress(wxString PropertySeg1, wxString PropertyS SLiter = SplitLength.find(6); AddressPostalCode = PropertySeg2.Mid(intPrevValue, SLiter->second); - //txtTitle->SetValue(ContactData.Convert(wxSPropertySeg2.Mid(intPrevValue, SLiter->second), TRUE)); intPrevValue = intiter->second; // Deal with country. AddressCountry = PropertySeg2.Mid(intPrevValue, wxString::npos); - //txtSuffix->SetValue(ContactData.Convert(wxSPropertySeg2.Mid(intPrevValue), TRUE)); - + break; } @@ -1790,6 +2056,7 @@ void ContactDataObject::ProcessEmail(wxString PropertySeg1, wxString PropertySeg wxString PropertyValue; wxString PropertyTokens; bool FirstToken = TRUE; + bool PropertyMatched = FALSE; for (std::map::iterator intiter = SplitPoints.begin(); intiter != SplitPoints.end(); ++intiter){ @@ -1808,53 +2075,30 @@ void ContactDataObject::ProcessEmail(wxString PropertySeg1, wxString PropertySeg // Process properties. - if (PropertyName == wxT("ALTID")){ - - EmailListAltID->erase(*EmailCount); - EmailListAltID->insert(std::make_pair(*EmailCount, PropertyValue)); + ProcessStringValue(&PropertyName, "ALTID", EmailListAltID, &PropertyValue, EmailCount, &PropertyMatched); + ProcessStringValue(&PropertyName, "PID", EmailListPID, &PropertyValue, EmailCount, &PropertyMatched); + ProcessIntegerValue(&PropertyName, "PREF", EmailListPref, &PropertyValue, EmailCount, &PropertyMatched); - } else if (PropertyName == wxT("PID")){ - - EmailListPID->erase(*EmailCount); - EmailListPID->insert(std::make_pair(*EmailCount, PropertyValue)); + if (PropertyMatched == TRUE){ - } else if (PropertyName == wxT("PREF")){ + PropertyMatched = FALSE; + continue; + + } + + if (!PropertyName.IsEmpty() && !PropertyValue.IsEmpty() && PropertyName != wxT("TYPE")){ - int PriorityNumber = 0; - bool ValidNumber = TRUE; + if (FirstToken == TRUE){ - try{ - PriorityNumber = std::stoi(PropertyValue.ToStdString()); - } + PropertyTokens.Append(PropertyName + wxT("=") + PropertyValue); + FirstToken = FALSE; - catch(std::invalid_argument &e){ - ValidNumber = FALSE; - } - - if (ValidNumber == TRUE){ - - EmailListPref->erase(*EmailCount); - EmailListPref->insert(std::make_pair(*EmailCount, PriorityNumber)); - - } - - } else { - - if (!PropertyName.IsEmpty() && !PropertyValue.IsEmpty() && PropertyName != wxT("TYPE")){ + } else { - if (FirstToken == TRUE){ - - PropertyTokens.Append(PropertyName + wxT("=") + PropertyValue); - FirstToken = FALSE; - - } else { - - PropertyTokens.Append(wxT(";") + PropertyName + wxT("=") + PropertyValue); - - } + PropertyTokens.Append(wxT(";") + PropertyName + wxT("=") + PropertyValue); } - + } } @@ -1936,6 +2180,7 @@ void ContactDataObject::ProcessIM(wxString PropertySeg1, wxString PropertySeg2, wxString PropertyValue; wxString PropertyTokens; bool FirstToken = TRUE; + bool PropertyMatched = FALSE; for (std::map::iterator intiter = SplitPoints.begin(); intiter != SplitPoints.end(); ++intiter){ @@ -1952,57 +2197,30 @@ void ContactDataObject::ProcessIM(wxString PropertySeg1, wxString PropertySeg2, CaptureString(&PropertyValue, FALSE); + ProcessStringValue(&PropertyName, "ALTID", IMListAltID, &PropertyValue, IMCount, &PropertyMatched); + ProcessStringValue(&PropertyName, "PID", IMListPID, &PropertyValue, IMCount, &PropertyMatched); + ProcessStringValue(&PropertyName, "MEDIATYPE", IMListMediatype, &PropertyValue, IMCount, &PropertyMatched); + ProcessIntegerValue(&PropertyName, "PREF", IMListPref, &PropertyValue, IMCount, &PropertyMatched); + // Process properties. - if (PropertyName == wxT("ALTID")){ - - IMListAltID->erase(*IMCount); - IMListAltID->insert(std::make_pair(*IMCount, PropertyValue)); + if (PropertyMatched == TRUE){ + + PropertyMatched = FALSE; + continue; - } else if (PropertyName == wxT("PID")){ - - IMListPID->erase(*IMCount); - IMListPID->insert(std::make_pair(*IMCount, PropertyValue)); + } - } else if (PropertyName == wxT("MEDIATYPE")){ - - IMListMediatype->erase(*IMCount); - IMListMediatype->insert(std::make_pair(*IMCount, PropertyValue)); + if (!PropertyName.IsEmpty() && !PropertyValue.IsEmpty() && PropertyName != wxT("TYPE")){ - } else if (PropertyName == wxT("PREF")){ + if (FirstToken == TRUE){ - int PriorityNumber = 0; - bool ValidNumber = TRUE; + PropertyTokens.Append(PropertyName + wxT("=") + PropertyValue); + FirstToken = FALSE; - try{ - PriorityNumber = std::stoi(PropertyValue.ToStdString()); - } - - catch(std::invalid_argument &e){ - ValidNumber = FALSE; - } - - if (ValidNumber == TRUE){ - - IMListPref->erase(*IMCount); - IMListPref->insert(std::make_pair(*IMCount, PriorityNumber)); - - } - - } else { - - if (!PropertyName.IsEmpty() && !PropertyValue.IsEmpty() && PropertyName != wxT("TYPE")){ - - if (FirstToken == TRUE){ - - PropertyTokens.Append(PropertyName + wxT("=") + PropertyValue); - FirstToken = FALSE; - - } else { - - PropertyTokens.Append(wxT(";") + PropertyName + wxT("=") + PropertyValue); - - } + } else { + + PropertyTokens.Append(wxT(";") + PropertyName + wxT("=") + PropertyValue); } @@ -2252,6 +2470,8 @@ void ContactDataObject::ProcessTelephone(wxString PropertySeg1, wxString Propert intPrevValue = 4; + bool PropertyMatched = FALSE; + for (std::map::iterator intiter = SplitPoints.begin(); intiter != SplitPoints.end(); ++intiter){ @@ -2269,50 +2489,27 @@ void ContactDataObject::ProcessTelephone(wxString PropertySeg1, wxString Propert // Process properties. - if (PropertyName == wxT("ALTID")){ - - TelephoneListAltID->erase(*TelephoneCount); - TelephoneListAltID->insert(std::make_pair(*TelephoneCount, PropertyValue)); + ProcessStringValue(&PropertyName, "ALTID", TelephoneListAltID, &PropertyValue, TelephoneCount, &PropertyMatched); + ProcessStringValue(&PropertyName, "PID", TelephoneListPID, &PropertyValue, TelephoneCount, &PropertyMatched); + ProcessIntegerValue(&PropertyName, "PREF", TelephoneListPref, &PropertyValue, TelephoneCount, &PropertyMatched); - } else if (PropertyName == wxT("PID")){ + if (PropertyMatched == TRUE){ + + PropertyMatched = FALSE; + continue; + + } - TelephoneListPID->erase(*TelephoneCount); - TelephoneListPID->insert(std::make_pair(*TelephoneCount, PropertyValue)); + if (!PropertyName.IsEmpty() && !PropertyValue.IsEmpty() && PropertyName != wxT("TYPE")){ - } else if (PropertyName == wxT("PREF")){ - - int PriorityNumber = 0; - bool ValidNumber = TRUE; + if (FirstToken == TRUE){ - try{ - PriorityNumber = std::stoi(PropertyValue.ToStdString()); - } + PropertyTokens.Append(PropertyName + wxT("=") + PropertyValue); + FirstToken = FALSE; - catch(std::invalid_argument &e){ - ValidNumber = FALSE; - } - - if (ValidNumber == TRUE){ - - TelephoneListPref->erase(*TelephoneCount); - TelephoneListPref->insert(std::make_pair(*TelephoneCount, PriorityNumber)); - - } - - } else { - - if (!PropertyName.IsEmpty() && !PropertyValue.IsEmpty() && PropertyName != wxT("TYPE")){ + } else { - if (FirstToken == TRUE){ - - PropertyTokens.Append(PropertyName + wxT("=") + PropertyValue); - FirstToken = FALSE; - - } else { - - PropertyTokens.Append(wxT(";") + PropertyName + wxT("=") + PropertyValue); - - } + PropertyTokens.Append(wxT(";") + PropertyName + wxT("=") + PropertyValue); } @@ -2376,24 +2573,779 @@ void ContactDataObject::ProcessLanguage(wxString PropertySeg1, wxString Property LanguageListPref = &HomeLanguageListPref; break; case PROPERTY_WORK: - LanguageList = &BusinessLanguageList; - LanguageListType = &BusinessLanguageListType; - LanguageListAltID = &BusinessLanguageListAltID; - LanguageListPID = &BusinessLanguageListPID; - LanguageListTokens = &BusinessLanguageListTokens; - LanguageListPref = &BusinessLanguageListPref; + LanguageList = &BusinessLanguageList; + LanguageListType = &BusinessLanguageListType; + LanguageListAltID = &BusinessLanguageListAltID; + LanguageListPID = &BusinessLanguageListPID; + LanguageListTokens = &BusinessLanguageListTokens; + LanguageListPref = &BusinessLanguageListPref; + break; + } + + intPrevValue = 5; + + std::map::iterator SLiter; + wxString PropertyData; + wxString PropertyName; + wxString PropertyValue; + wxString PropertyTokens; + bool FirstToken = TRUE; + bool PropertyMatched = FALSE; + + 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); + + // Process properties. + + ProcessStringValue(&PropertyName, "ALTID", LanguageListAltID, &PropertyValue, LanguageCount, &PropertyMatched); + ProcessStringValue(&PropertyName, "PID", LanguageListPID, &PropertyValue, LanguageCount, &PropertyMatched); + ProcessIntegerValue(&PropertyName, "PREF", LanguageListPref, &PropertyValue, LanguageCount, &PropertyMatched); + + if (PropertyMatched == TRUE){ + + PropertyMatched = FALSE; + continue; + + } + + if (!PropertyName.IsEmpty() && !PropertyValue.IsEmpty() && PropertyName != wxT("TYPE")){ + + if (FirstToken == TRUE){ + + PropertyTokens.Append(PropertyName + wxT("=") + PropertyValue); + FirstToken = FALSE; + + } else { + + PropertyTokens.Append(wxT(";") + PropertyName + wxT("=") + PropertyValue); + + } + + } + + } + + LanguageList->insert(std::make_pair(*LanguageCount, PropertySeg2)); + + // Add the name token data. + + if (!PropertyTokens.IsEmpty()){ + + LanguageListTokens->insert(std::make_pair(*LanguageCount, PropertyTokens)); + + } + +} + +void ContactDataObject::ProcessGeographic(wxString PropertySeg1, wxString PropertySeg2, int *GeographicCount){ + + std::map SplitPoints; + std::map SplitLength; + + int intPrevValue = 5; + int intPref = 0; + + SplitValues(&PropertySeg1, &SplitPoints, &SplitLength, intPrevValue); + + intPrevValue = 4; + + PropertyType PropType = PROPERTY_NONE; + + // Look for type before continuing. + + CheckType(&PropertySeg1, &SplitPoints, &SplitLength, &intPrevValue, &PropType); + + std::map *GeopositionList = NULL; + std::map *GeopositionListType = NULL; + std::map *GeopositionListAltID = NULL; + std::map *GeopositionListPID = NULL; + std::map *GeopositionListTokens = NULL; + std::map *GeopositionListMediatype = NULL; + std::map *GeopositionListPref = NULL; + + switch(PropType){ + case PROPERTY_NONE: + GeopositionList = &GeneralGeographyList; + GeopositionListType = &GeneralGeographyListType; + GeopositionListAltID = &GeneralGeographyListAltID; + GeopositionListPID = &GeneralGeographyListPID; + GeopositionListTokens = &GeneralGeographyListTokens; + GeopositionListMediatype = &GeneralGeographyListMediatype; + GeopositionListPref = &GeneralGeographyListPref; + break; + case PROPERTY_HOME: + GeopositionList = &HomeGeographyList; + GeopositionListType = &HomeGeographyListType; + GeopositionListAltID = &HomeGeographyListAltID; + GeopositionListPID = &HomeGeographyListPID; + GeopositionListTokens = &HomeGeographyListTokens; + GeopositionListMediatype = &HomeGeographyListMediatype; + GeopositionListPref = &HomeGeographyListPref; + break; + case PROPERTY_WORK: + GeopositionList = &BusinessGeographyList; + GeopositionListType = &BusinessGeographyListType; + GeopositionListAltID = &BusinessGeographyListAltID; + GeopositionListPID = &BusinessGeographyListPID; + GeopositionListTokens = &BusinessGeographyListTokens; + GeopositionListMediatype = &BusinessGeographyListMediatype; + GeopositionListPref = &BusinessGeographyListPref; + break; + } + + intPrevValue = 4; + + std::map::iterator SLiter; + wxString PropertyData; + wxString PropertyName; + wxString PropertyValue; + wxString PropertyTokens; + bool FirstToken = TRUE; + bool PropertyMatched = FALSE; + + 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); + + // Process properties. + + ProcessStringValue(&PropertyName, "ALTID", GeopositionListAltID, &PropertyValue, GeographicCount, &PropertyMatched); + ProcessStringValue(&PropertyName, "PID", GeopositionListPID, &PropertyValue, GeographicCount, &PropertyMatched); + ProcessStringValue(&PropertyName, "MEDIATYPE", GeopositionListMediatype, &PropertyValue, GeographicCount, &PropertyMatched); + ProcessIntegerValue(&PropertyName, "PREF", GeopositionListPref, &PropertyValue, GeographicCount, &PropertyMatched); + + if (PropertyMatched == TRUE){ + + PropertyMatched = FALSE; + continue; + + } + + if (!PropertyName.IsEmpty() && !PropertyValue.IsEmpty() && PropertyName != wxT("TYPE")){ + + if (FirstToken == TRUE){ + + PropertyTokens.Append(PropertyName + wxT("=") + PropertyValue); + FirstToken = FALSE; + + } else { + + PropertyTokens.Append(wxT(";") + PropertyName + wxT("=") + PropertyValue); + + } + + } + + } + + GeopositionList->insert(std::make_pair(*GeographicCount, PropertySeg2)); + + // Add the name token data. + + if (!PropertyTokens.IsEmpty()){ + + GeopositionListTokens->insert(std::make_pair(*GeographicCount, PropertyTokens)); + + } + +} + +void ContactDataObject::ProcessRelated(wxString PropertySeg1, wxString PropertySeg2, int *RelatedCount){ + + size_t intPropertyLen = PropertySeg1.Len(); + std::map SplitPoints; + std::map SplitLength; + std::map::iterator SLiter; + wxString PropertyData; + wxString PropertyName; + wxString PropertyValue; + wxString PropertyTokens; + wxString RelatedType; + wxString RelatedTypeOriginal; + wxString RelatedName; + bool FirstToken = TRUE; + int intSplitsFound = 0; + int intSplitSize = 0; + int intPrevValue = 9; + int intPref = 0; + long ListCtrlIndex; + + SplitValues(&PropertySeg1, &SplitPoints, &SplitLength, intPrevValue); + + intPrevValue = 8; + + // Look for type before continuing. + + 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 these. + + RelatedTypeOriginal = PropertyValue; + + if (PropertyName == wxT("TYPE")){ + + if (PropertyValue == wxT("contact")){ + + RelatedType = _("Contact"); + + } else if (PropertyValue == wxT("acquaintance")){ + + RelatedType = _("Acquaintance"); + + } else if (PropertyValue == wxT("friend")){ + + RelatedType = _("Friend"); + + } else if (PropertyValue == wxT("met")){ + + RelatedType = _("Met"); + + } else if (PropertyValue == wxT("co-worker")){ + + RelatedType = _("Co-worker"); + + } else if (PropertyValue == wxT("colleague")){ + + RelatedType = _("Colleague"); + + } else if (PropertyValue == wxT("co-resident")){ + + RelatedType = _("Co-resident"); + + } else if (PropertyValue == wxT("neighbor")){ + + RelatedType = _("Neighbour"); + + } else if (PropertyValue == wxT("child")){ + + RelatedType = _("Child"); + + } else if (PropertyValue == wxT("parent")){ + + RelatedType = _("Parent"); + + } else if (PropertyValue == wxT("sibling")){ + + RelatedType = _("Sibling"); + + } else if (PropertyValue == wxT("spouse")){ + + RelatedType = _("Spouse"); + + } else if (PropertyValue == wxT("kin")){ + + RelatedType = _("Kin"); + + } else if (PropertyValue == wxT("muse")){ + + RelatedType = _("Muse"); + + } else if (PropertyValue == wxT("crush")){ + + RelatedType = _("Crush"); + + } else if (PropertyValue == wxT("date")){ + + RelatedType = _("Date"); + + } else if (PropertyValue == wxT("sweetheart")){ + + RelatedType = _("Sweetheart"); + + } else if (PropertyValue == wxT("me")){ + + RelatedType = _("Me"); + + } else if (PropertyValue == wxT("agent")){ + + RelatedType = _("Agent"); + + } else if (PropertyValue == wxT("emergency")){ + + RelatedType = _("Emergency"); + + } else { + + RelatedType = PropertyValue; + + } + + } + + } + + intPrevValue = 8; + + bool PropertyMatched = FALSE; + + 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); + + ProcessStringValue(&PropertyName, "ALTID", &GeneralRelatedListAltID, &PropertyValue, RelatedCount, &PropertyMatched); + ProcessStringValue(&PropertyName, "PID", &GeneralRelatedListPID, &PropertyValue, RelatedCount, &PropertyMatched); + ProcessStringValue(&PropertyName, "LANGUAGE", &GeneralRelatedListLanguage, &PropertyValue, RelatedCount, &PropertyMatched); + ProcessIntegerValue(&PropertyName, "PREF", &GeneralRelatedListPref, &PropertyValue, RelatedCount, &PropertyMatched); + + if (PropertyMatched == TRUE){ + + PropertyMatched = FALSE; + continue; + + } + + if (!PropertyName.IsEmpty() && !PropertyValue.IsEmpty() && PropertyName != wxT("TYPE")){ + + if (FirstToken == TRUE){ + + PropertyTokens.Append(PropertyName + wxT("=") + PropertyValue); + FirstToken = FALSE; + + } else { + + PropertyTokens.Append(wxT(";") + PropertyName + wxT("=") + PropertyValue); + + } + + } + + } + + // Add the data to the General/Home/Work address variables. + + GeneralRelatedList.erase(*RelatedCount); + GeneralRelatedListRelType.erase(*RelatedCount); + GeneralRelatedListType.erase(*RelatedCount); + GeneralRelatedListTokens.erase(*RelatedCount); + GeneralRelatedList.insert(std::make_pair(*RelatedCount, PropertySeg2)); + GeneralRelatedListRelType.insert(std::make_pair(*RelatedCount, RelatedType)); + GeneralRelatedListType.insert(std::make_pair(*RelatedCount, RelatedType)); + GeneralRelatedListTokens.insert(std::make_pair(*RelatedCount, PropertyTokens)); + +} + +void ContactDataObject::ProcessURL(wxString PropertySeg1, wxString PropertySeg2, int *URLCount){ + + std::map SplitPoints; + std::map SplitLength; + std::map::iterator SLiter; + wxString PropertyData; + wxString PropertyName; + wxString PropertyValue; + wxString PropertyTokens; + bool FirstToken = TRUE; + int intPrevValue = 5; + int intPref = 0; + int intType = 0; + long ListCtrlIndex; + + SplitValues(&PropertySeg1, &SplitPoints, &SplitLength, intPrevValue); + + intPrevValue = 4; + + PropertyType PropType = PROPERTY_NONE; + + // Look for type before continuing. + + CheckType(&PropertySeg1, &SplitPoints, &SplitLength, &intPrevValue, &PropType); + + // Setup the pointers. + + std::map *WebsiteList = NULL; + std::map *WebsiteListAltID = NULL; + std::map *WebsiteListPID = NULL; + std::map *WebsiteListType = NULL; + std::map *WebsiteListTokens = NULL; + std::map *WebsiteListMediatype = NULL; + std::map *WebsiteListPref = NULL; + + // Setup blank lines for later on. + + switch(PropType){ + case PROPERTY_NONE: + WebsiteList = &GeneralWebsiteList; + WebsiteListType = &GeneralWebsiteListType; + WebsiteListAltID = &GeneralWebsiteListAltID; + WebsiteListPID = &GeneralWebsiteListPID; + WebsiteListTokens = &GeneralWebsiteListTokens; + WebsiteListMediatype = &GeneralWebsiteListMediatype; + WebsiteListPref = &GeneralWebsiteListPref; + break; + case PROPERTY_HOME: + WebsiteList = &HomeWebsiteList; + WebsiteListType = &HomeWebsiteListType; + WebsiteListAltID = &HomeWebsiteListAltID; + WebsiteListPID = &HomeWebsiteListPID; + WebsiteListTokens = &HomeWebsiteListTokens; + WebsiteListMediatype = &HomeWebsiteListMediatype; + WebsiteListPref = &HomeWebsiteListPref; + break; + case PROPERTY_WORK: + WebsiteList = &BusinessWebsiteList; + WebsiteListType = &BusinessWebsiteListType; + WebsiteListAltID = &BusinessWebsiteListAltID; + WebsiteListPID = &BusinessWebsiteListPID; + WebsiteListTokens = &BusinessWebsiteListTokens; + WebsiteListMediatype = &BusinessWebsiteListMediatype; + WebsiteListPref = &BusinessWebsiteListPref; + break; + } + + intPrevValue = 4; + bool PropertyMatched = FALSE; + + for (std::map::iterator intiter = SplitPoints.begin(); + intiter != SplitPoints.end(); ++intiter){ + + SLiter = SplitLength.find(intiter->first); + + PropertyData = PropertySeg1.Mid(intPrevValue, (SLiter->second)); + + wxStringTokenizer PropertyElement (PropertyData, wxT("=")); + PropertyName = PropertyElement.GetNextToken(); + PropertyValue = PropertyElement.GetNextToken(); + + intPrevValue = intiter->second; + + // Process properties. + + size_t intPropertyValueLen = PropertyValue.Len(); + + if (PropertyValue.Mid((intPropertyValueLen - 1), 1) == wxT("\"")){ + + PropertyValue.Trim(); + PropertyValue.RemoveLast(); + + } + + if (PropertyValue.Mid(0, 1) == wxT("\"")){ + + PropertyValue.Remove(0, 1); + + } + + CaptureString(&PropertyValue, FALSE); + + ProcessStringValue(&PropertyName, "ALTID", WebsiteListAltID, &PropertyValue, URLCount, &PropertyMatched); + ProcessStringValue(&PropertyName, "PID", WebsiteListPID, &PropertyValue, URLCount, &PropertyMatched); + ProcessStringValue(&PropertyName, "MEDIATYPE", WebsiteListMediatype, &PropertyValue, URLCount, &PropertyMatched); + ProcessIntegerValue(&PropertyName, "PREF", WebsiteListPref, &PropertyValue, URLCount, &PropertyMatched); + + if (PropertyMatched == TRUE){ + + PropertyMatched = FALSE; + continue; + + } + + if (!PropertyName.IsEmpty() && !PropertyValue.IsEmpty() && PropertyName != wxT("TYPE")){ + + if (FirstToken == TRUE){ + + PropertyTokens.Append(PropertyName + wxT("=") + PropertyValue); + FirstToken = FALSE; + + } else { + + PropertyTokens.Append(wxT(";") + PropertyName + wxT("=") + PropertyValue); + + } + + } + + } + + // Add the data to the General/Home/Work address variables. + + CaptureString(&PropertySeg2, FALSE); + + WebsiteList->insert(std::make_pair(*URLCount, PropertySeg2)); + + if (!PropertyTokens.IsEmpty()){ + + WebsiteListTokens->insert(std::make_pair(*URLCount, PropertyTokens)); + + } + +} + +void ContactDataObject::ProcessTitle(wxString PropertySeg1, wxString PropertySeg2, int *TitleCount){ + + std::map 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; + bool PropertyMatched = FALSE; + + 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); + + ProcessStringValue(&PropertyName, "ALTID", TitleListAltID, &PropertyValue, TitleCount, &PropertyMatched); + ProcessStringValue(&PropertyName, "PID", TitleListPID, &PropertyValue, TitleCount, &PropertyMatched); + ProcessStringValue(&PropertyName, "LANGUAGE", TitleListLanguage, &PropertyValue, TitleCount, &PropertyMatched); + ProcessIntegerValue(&PropertyName, "PREF", TitleListPref, &PropertyValue, TitleCount, &PropertyMatched); + + if (PropertyMatched == TRUE){ + + PropertyMatched = FALSE; + continue; + + } + + if (!PropertyName.IsEmpty() && !PropertyValue.IsEmpty() && PropertyName != wxT("TYPE")){ + + if (FirstToken == TRUE){ + + PropertyTokens.Append(PropertyName + wxT("=") + PropertyValue); + FirstToken = FALSE; + + } else { + + PropertyTokens.Append(wxT(";") + PropertyName + wxT("=") + PropertyValue); + + } + + } + + } + + // Add the data to the General/Home/Work address variables. + + CaptureString(&PropertySeg2, FALSE); + + TitleList->insert(std::make_pair(*TitleCount, PropertySeg2)); + + if (!PropertyTokens.IsEmpty()){ + + TitleListTokens->insert(std::make_pair(*TitleCount, PropertyTokens)); + + } + +} + +void ContactDataObject::ProcessRole(wxString PropertySeg1, wxString PropertySeg2, int *RoleCount){ + + std::map 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 = 5; - - std::map::iterator SLiter; - wxString PropertyData; - wxString PropertyName; - wxString PropertyValue; - wxString PropertyTokens; - bool FirstToken = TRUE; - + bool PropertyMatched = FALSE; + for (std::map::iterator intiter = SplitPoints.begin(); intiter != SplitPoints.end(); ++intiter){ @@ -2407,80 +3359,82 @@ void ContactDataObject::ProcessLanguage(wxString PropertySeg1, wxString Property intPrevValue = intiter->second; - CaptureString(&PropertyValue, FALSE); - // Process properties. - if (PropertyName == wxT("ALTID")){ - - LanguageListAltID->erase(*LanguageCount); - LanguageListAltID->insert(std::make_pair(*LanguageCount, PropertyValue)); - - } else if (PropertyName == wxT("PID")){ - - LanguageListPID->erase(*LanguageCount); - LanguageListPID->insert(std::make_pair(*LanguageCount, 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){ - - LanguageListPref->erase(*LanguageCount); - LanguageListPref->insert(std::make_pair(*LanguageCount, PriorityNumber)); - - } - - } else { + } - if (!PropertyName.IsEmpty() && !PropertyValue.IsEmpty() && PropertyName != wxT("TYPE")){ + if (PropertyValue.Mid(0, 1) == wxT("\"")){ - if (FirstToken == TRUE){ - - PropertyTokens.Append(PropertyName + wxT("=") + PropertyValue); - FirstToken = FALSE; - - } else { - - PropertyTokens.Append(wxT(";") + PropertyName + wxT("=") + PropertyValue); - - } + PropertyValue.Remove(0, 1); - } + } + + CaptureString(&PropertyValue, FALSE); + + ProcessStringValue(&PropertyName, "ALTID", RoleListAltID, &PropertyValue, RoleCount, &PropertyMatched); + ProcessStringValue(&PropertyName, "PID", RoleListPID, &PropertyValue, RoleCount, &PropertyMatched); + ProcessStringValue(&PropertyName, "LANGUAGE", RoleListLanguage, &PropertyValue, RoleCount, &PropertyMatched); + ProcessIntegerValue(&PropertyName, "PREF", RoleListPref, &PropertyValue, RoleCount, &PropertyMatched); + + if (PropertyMatched == TRUE){ + + PropertyMatched = FALSE; + continue; } + + if (!PropertyName.IsEmpty() && !PropertyValue.IsEmpty() && PropertyName != wxT("TYPE")){ - } + if (FirstToken == TRUE){ - LanguageList->insert(std::make_pair(*LanguageCount, PropertySeg2)); + PropertyTokens.Append(PropertyName + wxT("=") + PropertyValue); + FirstToken = FALSE; + + } else { + + PropertyTokens.Append(wxT(";") + PropertyName + wxT("=") + PropertyValue); + + } - // Add the name token data. + } + + } - if (!PropertyTokens.IsEmpty()){ + // Add the data to the General/Home/Work address variables. - LanguageListTokens->insert(std::make_pair(*LanguageCount, PropertyTokens)); + CaptureString(&PropertySeg2, FALSE); + + RoleList->insert(std::make_pair(*RoleCount, PropertySeg2)); + if (!PropertyTokens.IsEmpty()){ + + RoleListTokens->insert(std::make_pair(*RoleCount, PropertyTokens)); + } } -void ContactDataObject::ProcessGeographic(wxString PropertySeg1, wxString PropertySeg2, int *GeographicCount){ +void ContactDataObject::ProcessOrganisation(wxString PropertySeg1, wxString PropertySeg2, int *OrganisationCount){ std::map SplitPoints; std::map SplitLength; - + std::map::iterator SLiter; + wxString PropertyData; + wxString PropertyName; + wxString PropertyValue; + wxString PropertyTokens; + bool FirstToken = TRUE; int intPrevValue = 5; int intPref = 0; + int intType = 0; + long ListCtrlIndex; SplitValues(&PropertySeg1, &SplitPoints, &SplitLength, intPrevValue); @@ -2492,53 +3446,54 @@ void ContactDataObject::ProcessGeographic(wxString PropertySeg1, wxString Proper CheckType(&PropertySeg1, &SplitPoints, &SplitLength, &intPrevValue, &PropType); - std::map *GeopositionList = NULL; - std::map *GeopositionListType = NULL; - std::map *GeopositionListAltID = NULL; - std::map *GeopositionListPID = NULL; - std::map *GeopositionListTokens = NULL; - std::map *GeopositionListMediatype = NULL; - std::map *GeopositionListPref = NULL; - + // 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: - GeopositionList = &GeneralGeographyList; - GeopositionListType = &GeneralGeographyListType; - GeopositionListAltID = &GeneralGeographyListAltID; - GeopositionListPID = &GeneralGeographyListPID; - GeopositionListTokens = &GeneralGeographyListTokens; - GeopositionListMediatype = &GeneralGeographyListMediatype; - GeopositionListPref = &GeneralGeographyListPref; + OrganisationsList = &GeneralOrganisationsList; + OrganisationsListType = &GeneralOrganisationsListType; + OrganisationsListAltID = &GeneralOrganisationsListAltID; + OrganisationsListPID = &GeneralOrganisationsListPID; + OrganisationsListTokens = &GeneralOrganisationsListTokens; + OrganisationsListLanguage = &GeneralOrganisationsListLanguage; + OrganisationsListSortAs = &GeneralOrganisationsListSortAs; + OrganisationsListPref = &GeneralOrganisationsListPref; break; case PROPERTY_HOME: - GeopositionList = &HomeGeographyList; - GeopositionListType = &HomeGeographyListType; - GeopositionListAltID = &HomeGeographyListAltID; - GeopositionListPID = &HomeGeographyListPID; - GeopositionListTokens = &HomeGeographyListTokens; - GeopositionListMediatype = &HomeGeographyListMediatype; - GeopositionListPref = &HomeGeographyListPref; + OrganisationsList = &HomeOrganisationsList; + OrganisationsListType = &HomeOrganisationsListType; + OrganisationsListAltID = &HomeOrganisationsListAltID; + OrganisationsListPID = &HomeOrganisationsListPID; + OrganisationsListTokens = &HomeOrganisationsListTokens; + OrganisationsListLanguage = &HomeOrganisationsListLanguage; + OrganisationsListSortAs = &HomeOrganisationsListSortAs; + OrganisationsListPref = &HomeOrganisationsListPref; break; case PROPERTY_WORK: - GeopositionList = &BusinessGeographyList; - GeopositionListType = &BusinessGeographyListType; - GeopositionListAltID = &BusinessGeographyListAltID; - GeopositionListPID = &BusinessGeographyListPID; - GeopositionListTokens = &BusinessGeographyListTokens; - GeopositionListMediatype = &BusinessGeographyListMediatype; - GeopositionListPref = &BusinessGeographyListPref; + OrganisationsList = &BusinessOrganisationsList; + OrganisationsListType = &BusinessOrganisationsListType; + OrganisationsListAltID = &BusinessOrganisationsListAltID; + OrganisationsListPID = &BusinessOrganisationsListPID; + OrganisationsListTokens = &BusinessOrganisationsListTokens; + OrganisationsListLanguage = &BusinessOrganisationsListLanguage; + OrganisationsListSortAs = &BusinessOrganisationsListSortAs; + OrganisationsListPref = &BusinessOrganisationsListPref; break; } - + intPrevValue = 4; - - std::map::iterator SLiter; - wxString PropertyData; - wxString PropertyName; - wxString PropertyValue; - wxString PropertyTokens; - bool FirstToken = TRUE; - + for (std::map::iterator intiter = SplitPoints.begin(); intiter != SplitPoints.end(); ++intiter){ @@ -2552,81 +3507,89 @@ void ContactDataObject::ProcessGeographic(wxString PropertySeg1, wxString Proper intPrevValue = intiter->second; - CaptureString(&PropertyValue, FALSE); - // 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")){ - - GeopositionListAltID->erase(*GeographicCount); - GeopositionListAltID->insert(std::make_pair(*GeographicCount, PropertyValue)); + + OrganisationsListAltID->erase(*OrganisationCount); + OrganisationsListAltID->insert(std::make_pair(*OrganisationCount, PropertyValue)); } else if (PropertyName == wxT("PID")){ - GeopositionListPID->erase(*GeographicCount); - GeopositionListPID->insert(std::make_pair(*GeographicCount, PropertyValue)); + OrganisationsListPID->erase(*OrganisationCount); + OrganisationsListPID->insert(std::make_pair(*OrganisationCount, PropertyValue)); - } else if (PropertyName == wxT("MEDIATYPE")){ + } else if (PropertyName == wxT("SORT-AS")){ - GeopositionListMediatype->erase(*GeographicCount); - GeopositionListMediatype->insert(std::make_pair(*GeographicCount, PropertyValue)); + OrganisationsListSortAs->erase(*OrganisationCount); + OrganisationsListSortAs->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){ - - GeopositionListPref->erase(*GeographicCount); - GeopositionListPref->insert(std::make_pair(*GeographicCount, PriorityNumber)); - } + ProcessIntegerValue(OrganisationsListPref, &PropertyValue, OrganisationCount); + + } else if (PropertyName == wxT("LANGUAGE")){ + + OrganisationsListLanguage->erase(*OrganisationCount); + OrganisationsListLanguage->insert(std::make_pair(*OrganisationCount, PropertyValue)); } else { + // Something else we don't know about so append + // to the tokens variable. + if (!PropertyName.IsEmpty() && !PropertyValue.IsEmpty() && PropertyName != wxT("TYPE")){ - + if (FirstToken == TRUE){ - + PropertyTokens.Append(PropertyName + wxT("=") + PropertyValue); FirstToken = FALSE; - + } else { - + PropertyTokens.Append(wxT(";") + PropertyName + wxT("=") + PropertyValue); - - } + } + } } } - - GeopositionList->insert(std::make_pair(*GeographicCount, PropertySeg2)); - // Add the name token data. + // Add the data to the General/Home/Work address variables. + + CaptureString(&PropertySeg2, FALSE); + + OrganisationsList->insert(std::make_pair(*OrganisationCount, PropertySeg2)); if (!PropertyTokens.IsEmpty()){ - GeopositionListTokens->insert(std::make_pair(*GeographicCount, PropertyTokens)); - + OrganisationsListTokens->insert(std::make_pair(*OrganisationCount, PropertyTokens)); + } } -void ContactDataObject::ProcessRelated(wxString PropertySeg1, wxString PropertySeg2, int *RelatedCount){ +void ContactDataObject::ProcessNote(wxString PropertySeg1, wxString PropertySeg2, int *NoteCount){ - size_t intPropertyLen = PropertySeg1.Len(); std::map SplitPoints; std::map SplitLength; std::map::iterator SLiter; @@ -2634,133 +3597,66 @@ void ContactDataObject::ProcessRelated(wxString PropertySeg1, wxString PropertyS wxString PropertyName; wxString PropertyValue; wxString PropertyTokens; - wxString RelatedType; - wxString RelatedTypeOriginal; - wxString RelatedName; - bool FirstToken = TRUE; - int intSplitsFound = 0; - int intSplitSize = 0; - int intPrevValue = 9; - int intPref = 0; + bool FirstToken = TRUE; + int intPrevValue = 6; + int intPref = 0; + int intType = 0; long ListCtrlIndex; SplitValues(&PropertySeg1, &SplitPoints, &SplitLength, intPrevValue); - intPrevValue = 8; + intPrevValue = 5; + PropertyType PropType = PROPERTY_NONE; + // Look for type before continuing. - for (std::map::iterator intiter = SplitPoints.begin(); - intiter != SplitPoints.end(); ++intiter){ - - SLiter = SplitLength.find(intiter->first); + CheckType(&PropertySeg1, &SplitPoints, &SplitLength, &intPrevValue, &PropType); - PropertyData = PropertySeg1.Mid(intPrevValue, (SLiter->second)); - - wxStringTokenizer PropertyElement (PropertyData, wxT("=")); - PropertyName = PropertyElement.GetNextToken(); - PropertyValue = PropertyElement.GetNextToken(); - - intPrevValue = intiter->second; - - // Process these. - - RelatedTypeOriginal = PropertyValue; - - if (PropertyName == wxT("TYPE")){ - - if (PropertyValue == wxT("contact")){ - - RelatedType = _("Contact"); - - } else if (PropertyValue == wxT("acquaintance")){ - - RelatedType = _("Acquaintance"); - - } else if (PropertyValue == wxT("friend")){ - - RelatedType = _("Friend"); - - } else if (PropertyValue == wxT("met")){ - - RelatedType = _("Met"); - - } else if (PropertyValue == wxT("co-worker")){ - - RelatedType = _("Co-worker"); - - } else if (PropertyValue == wxT("colleague")){ - - RelatedType = _("Colleague"); - - } else if (PropertyValue == wxT("co-resident")){ - - RelatedType = _("Co-resident"); - - } else if (PropertyValue == wxT("neighbor")){ - - RelatedType = _("Neighbour"); - - } else if (PropertyValue == wxT("child")){ - - RelatedType = _("Child"); - - } else if (PropertyValue == wxT("parent")){ - - RelatedType = _("Parent"); - - } else if (PropertyValue == wxT("sibling")){ - - RelatedType = _("Sibling"); - - } else if (PropertyValue == wxT("spouse")){ - - RelatedType = _("Spouse"); - - } else if (PropertyValue == wxT("kin")){ - - RelatedType = _("Kin"); - - } else if (PropertyValue == wxT("muse")){ - - RelatedType = _("Muse"); - - } else if (PropertyValue == wxT("crush")){ - - RelatedType = _("Crush"); - - } else if (PropertyValue == wxT("date")){ - - RelatedType = _("Date"); - - } else if (PropertyValue == wxT("sweetheart")){ - - RelatedType = _("Sweetheart"); - - } else if (PropertyValue == wxT("me")){ - - RelatedType = _("Me"); - - } else if (PropertyValue == wxT("agent")){ - - RelatedType = _("Agent"); - - } else if (PropertyValue == wxT("emergency")){ - - RelatedType = _("Emergency"); - - } else { - - RelatedType = PropertyValue; - - } - - } + // 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; - intPrevValue = 8; + // 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){ @@ -2789,46 +3685,30 @@ void ContactDataObject::ProcessRelated(wxString PropertySeg1, wxString PropertyS PropertyValue.Remove(0, 1); - } + } CaptureString(&PropertyValue, FALSE); - + if (PropertyName == wxT("ALTID")){ - - GeneralRelatedListAltID.erase(*RelatedCount); - GeneralRelatedListAltID.insert(std::make_pair(*RelatedCount, PropertyValue)); + + NoteListAltID->erase(*NoteCount); + NoteListAltID->insert(std::make_pair(*NoteCount, PropertyValue)); } else if (PropertyName == wxT("PID")){ - GeneralRelatedListPID.erase(*RelatedCount); - GeneralRelatedListPID.insert(std::make_pair(*RelatedCount, PropertyValue)); + 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){ - - GeneralRelatedListPref.erase(*RelatedCount); - GeneralRelatedListPref.insert(std::make_pair(*RelatedCount, PriorityNumber)); - - } + ProcessIntegerValue(NoteListPref, &PropertyValue, NoteCount); } else if (PropertyName == wxT("LANGUAGE")){ - GeneralRelatedListLanguage.erase(*RelatedCount); - GeneralRelatedListLanguage.insert(std::make_pair(*RelatedCount, PropertyValue)); + NoteListLanguage->erase(*NoteCount); + NoteListLanguage->insert(std::make_pair(*NoteCount, PropertyValue)); - } else if (PropertyName != wxT("TYPE")) { + } else { // Something else we don't know about so append // to the tokens variable. @@ -2850,22 +3730,23 @@ void ContactDataObject::ProcessRelated(wxString PropertySeg1, wxString PropertyS } - } + } // Add the data to the General/Home/Work address variables. - - GeneralRelatedList.erase(*RelatedCount); - GeneralRelatedListRelType.erase(*RelatedCount); - GeneralRelatedListType.erase(*RelatedCount); - GeneralRelatedListTokens.erase(*RelatedCount); - GeneralRelatedList.insert(std::make_pair(*RelatedCount, PropertySeg2)); - GeneralRelatedListRelType.insert(std::make_pair(*RelatedCount, RelatedType)); - GeneralRelatedListType.insert(std::make_pair(*RelatedCount, RelatedType)); - GeneralRelatedListTokens.insert(std::make_pair(*RelatedCount, PropertyTokens)); + + CaptureString(&PropertySeg2, FALSE); + + NoteList->insert(std::make_pair(*NoteCount, PropertySeg2)); + + if (!PropertyTokens.IsEmpty()){ + + NoteListTokens->insert(std::make_pair(*NoteCount, PropertyTokens)); + + } } -void ContactDataObject::ProcessURL(wxString PropertySeg1, wxString PropertySeg2, int *URLCount){ +void ContactDataObject::ProcessCategory(wxString PropertySeg1, wxString PropertySeg2, int *CategoryCount){ std::map SplitPoints; std::map SplitLength; @@ -2875,14 +3756,14 @@ void ContactDataObject::ProcessURL(wxString PropertySeg1, wxString PropertySeg2, 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; @@ -2890,50 +3771,21 @@ void ContactDataObject::ProcessURL(wxString PropertySeg1, wxString PropertySeg2, CheckType(&PropertySeg1, &SplitPoints, &SplitLength, &intPrevValue, &PropType); - // Setup the pointers. - - std::map *WebsiteList = NULL; - std::map *WebsiteListAltID = NULL; - std::map *WebsiteListPID = NULL; - std::map *WebsiteListType = NULL; - std::map *WebsiteListTokens = NULL; - std::map *WebsiteListMediatype = NULL; - std::map *WebsiteListPref = NULL; - // Setup blank lines for later on. switch(PropType){ case PROPERTY_NONE: - WebsiteList = &GeneralWebsiteList; - WebsiteListType = &GeneralWebsiteListType; - WebsiteListAltID = &GeneralWebsiteListAltID; - WebsiteListPID = &GeneralWebsiteListPID; - WebsiteListTokens = &GeneralWebsiteListTokens; - WebsiteListMediatype = &GeneralWebsiteListMediatype; - WebsiteListPref = &GeneralWebsiteListPref; - break; - case PROPERTY_HOME: - WebsiteList = &HomeWebsiteList; - WebsiteListType = &HomeWebsiteListType; - WebsiteListAltID = &HomeWebsiteListAltID; - WebsiteListPID = &HomeWebsiteListPID; - WebsiteListTokens = &HomeWebsiteListTokens; - WebsiteListMediatype = &HomeWebsiteListMediatype; - WebsiteListPref = &HomeWebsiteListPref; - break; - case PROPERTY_WORK: - WebsiteList = &BusinessWebsiteList; - WebsiteListType = &BusinessWebsiteListType; - WebsiteListAltID = &BusinessWebsiteListAltID; - WebsiteListPID = &BusinessWebsiteListPID; - WebsiteListTokens = &BusinessWebsiteListTokens; - WebsiteListMediatype = &BusinessWebsiteListMediatype; - WebsiteListPref = &BusinessWebsiteListPref; + break; + case PROPERTY_HOME: + CategoriesListType.insert(std::make_pair(*CategoryCount, "home")); + break; + case PROPERTY_WORK: + CategoriesListType.insert(std::make_pair(*CategoryCount, "work")); break; } - - intPrevValue = 4; - + + intPrevValue = 11; + for (std::map::iterator intiter = SplitPoints.begin(); intiter != SplitPoints.end(); ++intiter){ @@ -2962,44 +3814,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)); + + CategoriesListAltID.erase(*CategoryCount); + CategoriesListAltID.insert(std::make_pair(*CategoryCount, PropertyValue)); } else if (PropertyName == wxT("PID")){ - WebsiteListPID->erase(*URLCount); - WebsiteListPID->insert(std::make_pair(*URLCount, 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){ - WebsiteListPref->erase(*URLCount); - WebsiteListPref->insert(std::make_pair(*URLCount, PriorityNumber)); - - } - - } else if (PropertyName == wxT("MEDIATYPE")){ + ProcessIntegerValue(&CategoriesListPref, &PropertyValue, CategoryCount); + + } else if (PropertyName == wxT("LANGUAGE")){ - WebsiteListMediatype->erase(*URLCount); - WebsiteListMediatype->insert(std::make_pair(*URLCount, PropertyValue)); + CategoriesListLanguage.erase(*CategoryCount); + CategoriesListLanguage.insert(std::make_pair(*CategoryCount, PropertyValue)); } else { @@ -3025,22 +3861,178 @@ void ContactDataObject::ProcessURL(wxString PropertySeg1, wxString PropertySeg2, } - // Add the data to the General/Home/Work address variables. + // Deal with multiple categories. - CaptureString(&PropertySeg2, FALSE); - - WebsiteList->insert(std::make_pair(*URLCount, PropertySeg2)); + int intOrigCatCount = *CategoryCount; + bool FirstCategoryProcessed = TRUE; + bool AfterFirstToken = FALSE; + int intSplitSize = 0; + int intSplitsFound = 0; + int intSplitSeek = 0; + int intPropertyLen = PropertySeg2.Len(); - if (!PropertyTokens.IsEmpty()){ + SplitPoints.clear(); + SplitLength.clear(); + intPrevValue = 0; - WebsiteListTokens->insert(std::make_pair(*URLCount, PropertyTokens)); + 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::ProcessTitle(wxString PropertySeg1, wxString PropertySeg2, int *TitleCount){ +void ContactDataObject::ProcessPhoto(wxString PropertySeg1, wxString PropertySeg2, int *PhotoCount){ + size_t intPropertyLen = PropertySeg1.Len(); std::map SplitPoints; std::map SplitLength; std::map::iterator SLiter; @@ -3049,10 +4041,11 @@ void ContactDataObject::ProcessTitle(wxString PropertySeg1, wxString PropertySeg wxString PropertyValue; wxString PropertyTokens; bool FirstToken = TRUE; + int intSplitsFound = 0; + int intSplitSize = 0; int intPrevValue = 7; int intPref = 0; int intType = 0; - long ListCtrlIndex; SplitValues(&PropertySeg1, &SplitPoints, &SplitLength, intPrevValue); @@ -3063,51 +4056,9 @@ void ContactDataObject::ProcessTitle(wxString PropertySeg1, wxString PropertySeg // 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){ @@ -3136,64 +4087,120 @@ void ContactDataObject::ProcessTitle(wxString PropertySeg1, wxString PropertySeg PropertyValue.Remove(0, 1); - } + } CaptureString(&PropertyValue, FALSE); if (PropertyName == wxT("ALTID")){ - - TitleListAltID->erase(*TitleCount); - TitleListAltID->insert(std::make_pair(*TitleCount, PropertyValue)); + + PicturesListAltID.erase(*PhotoCount); + PicturesListAltID.insert(std::make_pair(*PhotoCount, PropertyValue)); } else if (PropertyName == wxT("PID")){ - TitleListPID->erase(*TitleCount); - TitleListPID->insert(std::make_pair(*TitleCount, 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){ - - TitleListPref->erase(*TitleCount); - TitleListPref->insert(std::make_pair(*TitleCount, PriorityNumber)); - } - - } else if (PropertyName == wxT("LANGUAGE")){ + ProcessIntegerValue(&PicturesListPref, &PropertyValue, PhotoCount); - TitleListLanguage->erase(*TitleCount); - TitleListLanguage->insert(std::make_pair(*TitleCount, 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; } @@ -3201,20 +4208,32 @@ void ContactDataObject::ProcessTitle(wxString PropertySeg1, wxString PropertySeg // Add the data to the General/Home/Work address variables. - CaptureString(&PropertySeg2, FALSE); - - TitleList->insert(std::make_pair(*TitleCount, PropertySeg2)); + 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)); - TitleListTokens->insert(std::make_pair(*TitleCount, PropertyTokens)); - } } -void ContactDataObject::ProcessRole(wxString PropertySeg1, wxString PropertySeg2, int *RoleCount){ +void ContactDataObject::ProcessLogo(wxString PropertySeg1, wxString PropertySeg2, int *LogoCount){ + size_t intPropertyLen = PropertySeg1.Len(); std::map SplitPoints; std::map SplitLength; std::map::iterator SLiter; @@ -3223,10 +4242,11 @@ void ContactDataObject::ProcessRole(wxString PropertySeg1, wxString PropertySeg2 wxString PropertyValue; wxString PropertyTokens; bool FirstToken = TRUE; + int intSplitsFound = 0; + int intSplitSize = 0; int intPrevValue = 6; int intPref = 0; int intType = 0; - long ListCtrlIndex; SplitValues(&PropertySeg1, &SplitPoints, &SplitLength, intPrevValue); @@ -3237,51 +4257,9 @@ void ContactDataObject::ProcessRole(wxString PropertySeg1, wxString PropertySeg2 // 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 = 5; - + for (std::map::iterator intiter = SplitPoints.begin(); intiter != SplitPoints.end(); ++intiter){ @@ -3310,64 +4288,120 @@ void ContactDataObject::ProcessRole(wxString PropertySeg1, wxString PropertySeg2 PropertyValue.Remove(0, 1); - } + } CaptureString(&PropertyValue, FALSE); if (PropertyName == wxT("ALTID")){ - - RoleListAltID->erase(*RoleCount); - RoleListAltID->insert(std::make_pair(*RoleCount, PropertyValue)); + + LogosListAltID.erase(*LogoCount); + LogosListAltID.insert(std::make_pair(*LogoCount, PropertyValue)); } else if (PropertyName == wxT("PID")){ - RoleListPID->erase(*RoleCount); - RoleListPID->insert(std::make_pair(*RoleCount, 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){ - RoleListPref->erase(*RoleCount); - RoleListPref->insert(std::make_pair(*RoleCount, PriorityNumber)); - - } - - } else if (PropertyName == wxT("LANGUAGE")){ + ProcessIntegerValue(&LogosListPref, &PropertyValue, LogoCount); - RoleListLanguage->erase(*RoleCount); - RoleListLanguage->insert(std::make_pair(*RoleCount, 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){ + + 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){ - if (!PropertyName.IsEmpty() && !PropertyValue.IsEmpty() && PropertyName != wxT("TYPE")){ + wxSPhotoURI = wSTDataType.GetNextToken(); + wxSPhotoMIME = wSTDataType.GetNextToken(); + break; - if (FirstToken == TRUE){ - - PropertyTokens.Append(PropertyName + wxT("=") + PropertyValue); - FirstToken = FALSE; - - } else { - - PropertyTokens.Append(wxT(";") + PropertyName + wxT("=") + PropertyValue); - - } + } + + wxStringTokenizer wSTDataInfo(PropertySeg2.Mid((striter->second + 1)), wxT(",")); + + while (wSTDataInfo.HasMoreTokens() == TRUE){ - } + wxSPhotoEncoding = wSTDataInfo.GetNextToken(); + wxSPhotoData = wSTDataInfo.GetNextToken(); + base64enc = wxSPhotoData.mb_str(); + break; } @@ -3375,20 +4409,32 @@ void ContactDataObject::ProcessRole(wxString PropertySeg1, wxString PropertySeg2 // Add the data to the General/Home/Work address variables. - CaptureString(&PropertySeg2, FALSE); - - RoleList->insert(std::make_pair(*RoleCount, PropertySeg2)); + 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)); - RoleListTokens->insert(std::make_pair(*RoleCount, PropertyTokens)); - } } -void ContactDataObject::ProcessOrganisation(wxString PropertySeg1, wxString PropertySeg2, int *OrganisationCount){ +void ContactDataObject::ProcessSound(wxString PropertySeg1, wxString PropertySeg2, int *SoundCount){ + size_t intPropertyLen = PropertySeg1.Len(); std::map SplitPoints; std::map SplitLength; std::map::iterator SLiter; @@ -3397,69 +4443,24 @@ void ContactDataObject::ProcessOrganisation(wxString PropertySeg1, wxString Prop wxString PropertyValue; wxString PropertyTokens; bool FirstToken = TRUE; - int intPrevValue = 5; + int intSplitsFound = 0; + int intSplitSize = 0; + int intPrevValue = 7; int intPref = 0; int intType = 0; - long ListCtrlIndex; SplitValues(&PropertySeg1, &SplitPoints, &SplitLength, intPrevValue); - intPrevValue = 4; + intPrevValue = 6; 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 *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; - break; - case PROPERTY_WORK: - OrganisationsList = &BusinessOrganisationsList; - OrganisationsListType = &BusinessOrganisationsListType; - OrganisationsListAltID = &BusinessOrganisationsListAltID; - OrganisationsListPID = &BusinessOrganisationsListPID; - OrganisationsListTokens = &BusinessOrganisationsListTokens; - OrganisationsListLanguage = &BusinessOrganisationsListLanguage; - OrganisationsListSortAs = &BusinessOrganisationsListSortAs; - OrganisationsListPref = &BusinessOrganisationsListPref; - break; - } - intPrevValue = 4; - + intPrevValue = 6; + for (std::map::iterator intiter = SplitPoints.begin(); intiter != SplitPoints.end(); ++intiter){ @@ -3488,157 +4489,184 @@ void ContactDataObject::ProcessOrganisation(wxString PropertySeg1, wxString Prop PropertyValue.Remove(0, 1); - } + } CaptureString(&PropertyValue, FALSE); if (PropertyName == wxT("ALTID")){ - - OrganisationsListAltID->erase(*OrganisationCount); - OrganisationsListAltID->insert(std::make_pair(*OrganisationCount, PropertyValue)); - - } else if (PropertyName == wxT("PID")){ - OrganisationsListPID->erase(*OrganisationCount); - OrganisationsListPID->insert(std::make_pair(*OrganisationCount, PropertyValue)); + SoundsListAltID.erase(*SoundCount); + SoundsListAltID.insert(std::make_pair(*SoundCount, PropertyValue)); - } else if (PropertyName == wxT("SORT-AS")){ + } else if (PropertyName == wxT("PID")){ - OrganisationsListSortAs->erase(*OrganisationCount); - OrganisationsListSortAs->insert(std::make_pair(*OrganisationCount, 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){ - - OrganisationsListPref->erase(*OrganisationCount); - OrganisationsListPref->insert(std::make_pair(*OrganisationCount, PriorityNumber)); + ProcessIntegerValue(&SoundsListPref, &PropertyValue, SoundCount); + + } else if (PropertyName == wxT("MEDIATYPE")){ + + SoundsListMediatype.erase(*SoundCount); + SoundsListMediatype.insert(std::make_pair(*SoundCount, PropertyValue)); - } - } else if (PropertyName == wxT("LANGUAGE")){ - OrganisationsListLanguage->erase(*OrganisationCount); - OrganisationsListLanguage->insert(std::make_pair(*OrganisationCount, PropertyValue)); - + 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){ + 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); + + for (int i = 0; i <= intPropertyLen; i++){ - OrganisationsList->insert(std::make_pair(*OrganisationCount, PropertySeg2)); + intSplitSize++; - if (!PropertyTokens.IsEmpty()){ + if (PropertySeg2.Mid(i, 1) == wxT(";")){ - OrganisationsListTokens->insert(std::make_pair(*OrganisationCount, PropertyTokens)); + intSplitsFound++; + SplitPoints.insert(std::make_pair(intSplitsFound, (i + 1))); - } - -} - -void ContactDataObject::ProcessNote(wxString PropertySeg1, wxString PropertySeg2, int *NoteCount){ + if (intSplitsFound == 6){ + + SplitLength.insert(std::make_pair(intSplitsFound, (intSplitSize - 1))); + break; + + } else { + + SplitLength.insert(std::make_pair(intSplitsFound, (intSplitSize - 1))); + + } + + intSplitSize = 0; + + } - 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); + wxString wxSSoundURI; + wxString wxSSoundMIME; + wxString wxSSoundEncoding; + wxString wxSSoundData; + std::string base64enc; - intPrevValue = 5; + if (intSplitsFound == 0){ - PropertyType PropType = PROPERTY_NONE; - - // Look for type before continuing. + } else { - CheckType(&PropertySeg1, &SplitPoints, &SplitLength, &intPrevValue, &PropType); + std::map::iterator striter; - // Setup the pointers. + striter = SplitLength.find(1); - 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; + wxStringTokenizer wSTDataType(PropertySeg2.Mid(0, striter->second), wxT(":")); - // Setup blank lines for later on. + 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: - 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; + SoundsListType.insert(std::make_pair(*SoundCount, "home")); break; case PROPERTY_WORK: - NoteList = &BusinessNoteList; - NoteListType = &BusinessNoteListType; - NoteListAltID = &BusinessNoteListAltID; - NoteListPID = &BusinessNoteListPID; - NoteListTokens = &BusinessNoteListTokens; - NoteListLanguage = &BusinessNoteListLanguage; - NoteListPref = &BusinessNoteListPref; + SoundsListType.insert(std::make_pair(*SoundCount, "work")); break; } + + SoundsList.insert(std::make_pair(*SoundCount, base64enc)); + SoundsListAudioEncType.insert(std::make_pair(*SoundCount, wxSSoundEncoding)); + SoundsListAudioType.insert(std::make_pair(*SoundCount, wxSSoundMIME)); + + if (!PropertyTokens.IsEmpty()){ + + SoundsListTokens.insert(std::make_pair(*SoundCount, PropertyTokens)); + + } + +} + +void ContactDataObject::ProcessCalendarURI(wxString PropertySeg1, wxString PropertySeg2, int *CalURICount){ + + size_t intPropertyLen = PropertySeg1.Len(); + std::map 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; + + SplitValues(&PropertySeg1, &SplitPoints, &SplitLength, intPrevValue); + + intPrevValue = 7; + + PropertyType PropType = PROPERTY_NONE; + + // Look for type before continuing. + + CheckType(&PropertySeg1, &SplitPoints, &SplitLength, &intPrevValue, &PropType); + + intPrevValue = 7; - intPrevValue = 5; - for (std::map::iterator intiter = SplitPoints.begin(); intiter != SplitPoints.end(); ++intiter){ @@ -3667,85 +4695,88 @@ 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; - - 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(&CalendarListPref, &PropertyValue, CalURICount); - 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 +4785,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,239 +4831,222 @@ 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; - - 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(&CalendarRequestListPref, &PropertyValue, CalAdrURICount); - 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){ + } - CategoriesList.insert(std::make_pair(*CategoryCount, PropertySeg2)); +} + +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; - if (!PropertyTokens.IsEmpty()){ - - CategoriesListTokens.insert(std::make_pair(*CategoryCount, PropertyTokens)); - - } + 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); - 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")){ + + ProcessIntegerValue(&FreeBusyListPref, &PropertyValue, FreeBusyAddressCount); - // 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 +5059,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,45 +5104,22 @@ 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")){ - - 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")){ + ProcessIntegerValue(&KeyListPref, &PropertyValue, KeyCount); - PicturesListMediatype.erase(*PhotoCount); - PicturesListMediatype.insert(std::make_pair(*PhotoCount, PropertyValue)); - } else { // Something else we don't know about so append @@ -4163,7 +5142,7 @@ void ContactDataObject::ProcessPhoto(wxString PropertySeg1, wxString PropertySeg } - } + } intPropertyLen = PropertySeg2.Len(); SplitPoints.clear(); @@ -4172,13 +5151,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 +5177,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 +5195,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,29 +5219,148 @@ 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)); - PhotoCount++; + } + +} + +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)); + + } }