X-Git-Url: http://Server1/repobrowser/?a=blobdiff_plain;f=source%2Fcontacteditor%2FContactDataObject.cpp;h=23c53f3999116a01fe7332b5962439067289d744;hb=0a749c36a873e196f41a5f8c7da3f09592bf24fb;hp=d14043c53e13f4c90089380beae9aaac78e04d88;hpb=991f1b1f9333b7b4aae5543cc1c10474d33e83be;p=xestiaab%2F.git diff --git a/source/contacteditor/ContactDataObject.cpp b/source/contacteditor/ContactDataObject.cpp index d14043c..23c53f3 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; @@ -102,6 +105,12 @@ ContactLoadStatus ContactDataObject::LoadFile(wxString Filename){ 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; @@ -204,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); @@ -219,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); @@ -367,6 +401,31 @@ ContactLoadStatus ContactDataObject::LoadFile(wxString Filename){ 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++; + } } @@ -400,6 +459,269 @@ void ContactDataObject::ProcessKind(wxString KindType){ } +void ContactDataObject::ProcessRevision(wxString PropertySeg1, wxString PropertySeg2){ + + 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 = 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){ + + SLiter = SplitLength.find(intiter->first); + + PropertyData = PropertySeg1.Mid(intPrevValue, (SLiter->second)); + + wxStringTokenizer PropertyElement (PropertyData, wxT("=")); + PropertyName = PropertyElement.GetNextToken(); + PropertyValue = PropertyElement.GetNextToken(); + + intPrevValue = intiter->second; + + // Process properties. + + size_t intPropertyValueLen = PropertyValue.Len(); + + if (PropertyValue.Mid((intPropertyValueLen - 1), 1) == wxT("\"")){ + + PropertyValue.Trim(); + PropertyValue.RemoveLast(); + + } + + if (PropertyValue.Mid(0, 1) == wxT("\"")){ + + PropertyValue.Remove(0, 1); + + } + + CaptureString(&PropertyValue, FALSE); + + if (FirstToken == TRUE){ + + PropertyTokens.Append(PropertyName + wxT("=") + PropertyValue); + FirstToken = FALSE; + + } else { + + PropertyTokens.Append(wxT(";") + PropertyName + wxT("=") + PropertyValue); + + } + + } + + CaptureString(&PropertySeg2, FALSE); + + Revision = PropertySeg2; + + if (!PropertyTokens.IsEmpty()){ + + RevisionTokens = PropertyTokens; + + } + + +} + +void ContactDataObject::ProcessSource(wxString PropertySeg1, wxString PropertySeg2, int *SourceCount){ + + size_t intPropertyLen = PropertySeg1.Len(); + std::map 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; + + for (std::map::iterator intiter = SplitPoints.begin(); + intiter != SplitPoints.end(); ++intiter){ + + SLiter = SplitLength.find(intiter->first); + + PropertyData = PropertySeg1.Mid(intPrevValue, (SLiter->second)); + + wxStringTokenizer PropertyElement (PropertyData, wxT("=")); + PropertyName = PropertyElement.GetNextToken(); + PropertyValue = PropertyElement.GetNextToken(); + + intPrevValue = intiter->second; + + // Process properties. + + size_t intPropertyValueLen = PropertyValue.Len(); + + if (PropertyValue.Mid((intPropertyValueLen - 1), 1) == wxT("\"")){ + + PropertyValue.Trim(); + PropertyValue.RemoveLast(); + + } + + if (PropertyValue.Mid(0, 1) == wxT("\"")){ + + PropertyValue.Remove(0, 1); + + } + + CaptureString(&PropertyValue, FALSE); + + if (PropertyName == wxT("ALTID")){ + + SourceListAltID.erase(*SourceCount); + SourceListAltID.insert(std::make_pair(*SourceCount, PropertyValue)); + + } else if (PropertyName == wxT("PID")){ + + SourceListPID.erase(*SourceCount); + SourceListPID.insert(std::make_pair(*SourceCount, PropertyValue)); + + } else if (PropertyName == wxT("PREF")){ + + ProcessIntegerValue(this, &SourceListPref, &PropertyValue, SourceCount); + + } else if (PropertyName == wxT("MEDIATYPE")){ + + SourceListMediatype.erase(*SourceCount); + SourceListMediatype.insert(std::make_pair(*SourceCount, PropertyValue)); + + } else { + + // Something else we don't know about so append + // to the tokens variable. + + if (!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; + } + + SourceList.insert(std::make_pair(*SourceCount, PropertySeg2)); + + if (!PropertyTokens.IsEmpty()){ + + SourceListTokens.insert(std::make_pair(*SourceCount, PropertyTokens)); + + } + +} + +void ContactDataObject::ProcessXML(wxString PropertySeg1, wxString PropertySeg2, int *XMLCount){ + + std::map SplitPoints; + std::map SplitLength; + + int intPrevValue = 5; + int intPref = 0; + int intType = 0; + + SplitValues(&PropertySeg1, &SplitPoints, &SplitLength, intPrevValue); + + intPrevValue = 4; + + wxString PropertyName; + wxString PropertyValue; + wxString PropertyData; + wxString PropertyTokens; + std::map::iterator SLiter; + bool FirstToken = TRUE; + + for (std::map::iterator intiter = SplitPoints.begin(); + intiter != SplitPoints.end(); ++intiter){ + + SLiter = SplitLength.find(intiter->first); + + PropertyData = PropertySeg1.Mid(intPrevValue, (SLiter->second)); + + wxStringTokenizer PropertyElement (PropertyData, wxT("=")); + PropertyName = PropertyElement.GetNextToken(); + PropertyValue = PropertyElement.GetNextToken(); + + intPrevValue = intiter->second; + + CaptureString(&PropertyValue, FALSE); + + if (PropertyName == wxT("ALTID")){ + + XMLListAltID.erase(*XMLCount); + XMLListAltID.insert(std::make_pair(*XMLCount, PropertyValue)); + + } + + } + + XMLList.insert(std::make_pair(*XMLCount, PropertySeg2)); + +} + void ContactDataObject::ProcessMember(wxString PropertySeg1, wxString PropertySeg2, int *GroupCount){ std::map SplitPoints; @@ -447,23 +769,7 @@ void ContactDataObject::ProcessMember(wxString PropertySeg1, wxString PropertySe } else if (PropertyName == wxT("PREF")){ - int PriorityNumber = 0; - bool ValidNumber = TRUE; - - try{ - PriorityNumber = std::stoi(PropertyValue.ToStdString()); - } - - catch(std::invalid_argument &e){ - ValidNumber = FALSE; - } - - if (ValidNumber == TRUE){ - - GroupsListPref.erase(*GroupCount); - GroupsListPref.insert(std::make_pair(*GroupCount, PriorityNumber)); - - } + ProcessIntegerValue(this, &GroupsListPref, &PropertyValue, GroupCount); } else if (PropertyName == wxT("MEDIATYPE")){ @@ -560,23 +866,7 @@ void ContactDataObject::ProcessFN(wxString PropertySeg1, wxString PropertySeg2, } else if (PropertyName == wxT("PREF")){ - int PriorityNumber = 0; - bool ValidNumber = TRUE; - - try{ - PriorityNumber = std::stoi(PropertyValue.ToStdString()); - } - - catch(std::invalid_argument &e){ - ValidNumber = FALSE; - } - - if (ValidNumber == TRUE){ - - FullNamesListPref.erase(*FNCount); - FullNamesListPref.insert(std::make_pair(*FNCount, PriorityNumber)); - - } + ProcessIntegerValue(this, &FullNamesListPref, &PropertyValue, FNCount); } else if (!PropertyName.IsEmpty() && !PropertyValue.IsEmpty()){ @@ -760,6 +1050,90 @@ void ContactDataObject::ProcessN(wxString PropertySeg1, wxString PropertySeg2){ } +void ContactDataObject::ProcessClientPIDMap(wxString PropertySeg1, wxString PropertySeg2, int *ClientPIDCount){ + + 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 = 14; + int intPref = 0; + int intType = 0; + + SplitValues(&PropertySeg1, &SplitPoints, &SplitLength, intPrevValue); + + intPrevValue = 13; + + for (std::map::iterator intiter = SplitPoints.begin(); + intiter != SplitPoints.end(); ++intiter){ + + SLiter = SplitLength.find(intiter->first); + + PropertyData = PropertySeg1.Mid(intPrevValue, (SLiter->second)); + + wxStringTokenizer PropertyElement (PropertyData, wxT("=")); + PropertyName = PropertyElement.GetNextToken(); + PropertyValue = PropertyElement.GetNextToken(); + + intPrevValue = intiter->second; + + // Process properties. + + size_t intPropertyValueLen = PropertyValue.Len(); + + if (PropertyValue.Mid((intPropertyValueLen - 1), 1) == wxT("\"")){ + + PropertyValue.Trim(); + PropertyValue.RemoveLast(); + + } + + if (PropertyValue.Mid(0, 1) == wxT("\"")){ + + PropertyValue.Remove(0, 1); + + } + + CaptureString(&PropertyValue, FALSE); + + if (PropertyName.IsEmpty() || PropertyName.IsEmpty()){ + + continue; + + } + + if (FirstToken == TRUE){ + + PropertyTokens.Append(PropertyName + wxT("=") + PropertyValue); + FirstToken = FALSE; + + } else { + + PropertyTokens.Append(wxT(";") + PropertyName + wxT("=") + PropertyValue); + + } + + } + + CaptureString(&PropertySeg2, FALSE); + + ClientPIDList.insert(std::make_pair(*ClientPIDCount, PropertySeg2)); + + if (!PropertyTokens.IsEmpty()){ + + ClientPIDListTokens.insert(std::make_pair(*ClientPIDCount, PropertyTokens)); + + } + +} + void ContactDataObject::ProcessNickname(wxString PropertySeg1, wxString PropertySeg2, int *NicknameCount){ std::map SplitPoints; @@ -852,23 +1226,7 @@ void ContactDataObject::ProcessNickname(wxString PropertySeg1, wxString Property } else if (PropertyName == wxT("PREF")){ - int PriorityNumber = 0; - bool ValidNumber = TRUE; - - try{ - PriorityNumber = std::stoi(PropertyValue.ToStdString()); - } - - catch(std::invalid_argument &e){ - ValidNumber = FALSE; - } - - if (ValidNumber == TRUE){ - - NicknamesListPref->erase(*NicknameCount); - NicknamesListPref->insert(std::make_pair(*NicknameCount, PriorityNumber)); - - } + ProcessIntegerValue(this, NicknamesListPref, &PropertyValue, NicknameCount); } else if (PropertyName == wxT("LANGUAGE")){ @@ -1343,23 +1701,7 @@ void ContactDataObject::ProcessTimeZone(wxString PropertySeg1, wxString Property } else if (PropertyName == wxT("PREF")){ - int PriorityNumber = 0; - bool ValidNumber = TRUE; - - try{ - PriorityNumber = std::stoi(PropertyValue.ToStdString()); - } - - catch(std::invalid_argument &e){ - ValidNumber = FALSE; - } - - if (ValidNumber == TRUE){ - - TZListPref->erase(*TimeZoneCount); - TZListPref->insert(std::make_pair(*TimeZoneCount, PriorityNumber)); - - } + ProcessIntegerValue(this, TZListPref, &PropertyValue, TimeZoneCount); } else if (PropertyName == wxT("MEDIATYPE")){ @@ -1566,33 +1908,17 @@ void ContactDataObject::ProcessAddress(wxString PropertySeg1, wxString PropertyS } 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)); - - } 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){ + AddressListTimezone->erase(*AddressCount); + AddressListTimezone->insert(std::make_pair(*AddressCount, PropertyValue)); + + } else if (PropertyName == wxT("MEDIATYPE")){ - AddressListPref->erase(*AddressCount); - AddressListPref->insert(std::make_pair(*AddressCount, PriorityNumber)); + AddressListMediatype->erase(*AddressCount); + AddressListMediatype->insert(std::make_pair(*AddressCount, PropertyValue)); + + } else if (PropertyName == wxT("PREF")){ - } + ProcessIntegerValue(this, AddressListPref, &PropertyValue, AddressCount); } else { @@ -1857,23 +2183,7 @@ void ContactDataObject::ProcessEmail(wxString PropertySeg1, wxString PropertySeg } else if (PropertyName == wxT("PREF")){ - int PriorityNumber = 0; - bool ValidNumber = TRUE; - - try{ - PriorityNumber = std::stoi(PropertyValue.ToStdString()); - } - - catch(std::invalid_argument &e){ - ValidNumber = FALSE; - } - - if (ValidNumber == TRUE){ - - EmailListPref->erase(*EmailCount); - EmailListPref->insert(std::make_pair(*EmailCount, PriorityNumber)); - - } + ProcessIntegerValue(this, EmailListPref, &PropertyValue, EmailCount); } else { @@ -2008,23 +2318,7 @@ void ContactDataObject::ProcessIM(wxString PropertySeg1, wxString PropertySeg2, } else if (PropertyName == wxT("PREF")){ - int PriorityNumber = 0; - bool ValidNumber = TRUE; - - try{ - PriorityNumber = std::stoi(PropertyValue.ToStdString()); - } - - catch(std::invalid_argument &e){ - ValidNumber = FALSE; - } - - if (ValidNumber == TRUE){ - - IMListPref->erase(*IMCount); - IMListPref->insert(std::make_pair(*IMCount, PriorityNumber)); - - } + ProcessIntegerValue(this, IMListPref, &PropertyValue, IMCount); } else { @@ -4081,7 +4375,224 @@ void ContactDataObject::ProcessCategory(wxString PropertySeg1, wxString Property } -void ContactDataObject::ProcessPhoto(wxString PropertySeg1, wxString PropertySeg2, int *PhotoCount){ +void ContactDataObject::ProcessPhoto(wxString PropertySeg1, wxString PropertySeg2, int *PhotoCount){ + + size_t intPropertyLen = PropertySeg1.Len(); + std::map SplitPoints; + std::map SplitLength; + std::map::iterator SLiter; + wxString PropertyData; + wxString PropertyName; + wxString PropertyValue; + wxString PropertyTokens; + bool FirstToken = TRUE; + int intSplitsFound = 0; + int intSplitSize = 0; + int intPrevValue = 7; + int intPref = 0; + int intType = 0; + + SplitValues(&PropertySeg1, &SplitPoints, &SplitLength, intPrevValue); + + intPrevValue = 6; + + PropertyType PropType = PROPERTY_NONE; + + // Look for type before continuing. + + CheckType(&PropertySeg1, &SplitPoints, &SplitLength, &intPrevValue, &PropType); + + intPrevValue = 6; + + for (std::map::iterator intiter = SplitPoints.begin(); + intiter != SplitPoints.end(); ++intiter){ + + SLiter = SplitLength.find(intiter->first); + + PropertyData = PropertySeg1.Mid(intPrevValue, (SLiter->second)); + + wxStringTokenizer PropertyElement (PropertyData, wxT("=")); + PropertyName = PropertyElement.GetNextToken(); + PropertyValue = PropertyElement.GetNextToken(); + + intPrevValue = intiter->second; + + // Process properties. + + size_t intPropertyValueLen = PropertyValue.Len(); + + if (PropertyValue.Mid((intPropertyValueLen - 1), 1) == wxT("\"")){ + + PropertyValue.Trim(); + PropertyValue.RemoveLast(); + + } + + if (PropertyValue.Mid(0, 1) == wxT("\"")){ + + PropertyValue.Remove(0, 1); + + } + + CaptureString(&PropertyValue, FALSE); + + if (PropertyName == wxT("ALTID")){ + + PicturesListAltID.erase(*PhotoCount); + PicturesListAltID.insert(std::make_pair(*PhotoCount, PropertyValue)); + + } else if (PropertyName == wxT("PID")){ + + PicturesListPID.erase(*PhotoCount); + PicturesListPID.insert(std::make_pair(*PhotoCount, PropertyValue)); + + } else if (PropertyName == wxT("PREF")){ + + int PriorityNumber = 0; + bool ValidNumber = TRUE; + + try{ + PriorityNumber = std::stoi(PropertyValue.ToStdString()); + } + + catch(std::invalid_argument &e){ + ValidNumber = FALSE; + } + + if (ValidNumber == TRUE){ + + PicturesListPref.erase(*PhotoCount); + PicturesListPref.insert(std::make_pair(*PhotoCount, PriorityNumber)); + + } + + } else if (PropertyName == wxT("MEDIATYPE")){ + + PicturesListMediatype.erase(*PhotoCount); + PicturesListMediatype.insert(std::make_pair(*PhotoCount, PropertyValue)); + + } else { + + // Something else we don't know about so append + // to the tokens variable. + + if (!PropertyName.IsEmpty() && !PropertyValue.IsEmpty() && PropertyName != wxT("TYPE")){ + + if (FirstToken == TRUE){ + + PropertyTokens.Append(PropertyName + wxT("=") + PropertyValue); + FirstToken = FALSE; + + } else { + + PropertyTokens.Append(wxT(";") + PropertyName + wxT("=") + PropertyValue); + + } + + } + + } + + } + + intPropertyLen = PropertySeg2.Len(); + SplitPoints.clear(); + SplitLength.clear(); + intSplitsFound = 0; + intSplitSize = 0; + intPrevValue = 0; + + CaptureString(&PropertySeg2, FALSE); + + for (int i = 0; i <= intPropertyLen; i++){ + + intSplitSize++; + + if (PropertySeg2.Mid(i, 1) == wxT(";")){ + + intSplitsFound++; + SplitPoints.insert(std::make_pair(intSplitsFound, (i + 1))); + + if (intSplitsFound == 6){ + + SplitLength.insert(std::make_pair(intSplitsFound, (intSplitSize - 1))); + break; + + } else { + + SplitLength.insert(std::make_pair(intSplitsFound, (intSplitSize - 1))); + + } + + intSplitSize = 0; + + } + + } + + wxString wxSPhotoURI; + wxString wxSPhotoMIME; + wxString wxSPhotoEncoding; + wxString wxSPhotoData; + std::string base64enc; + + if (intSplitsFound == 0){ + + } else { + + std::map::iterator striter; + + striter = SplitLength.find(1); + + wxStringTokenizer wSTDataType(PropertySeg2.Mid(0, striter->second), wxT(":")); + + while (wSTDataType.HasMoreTokens() == TRUE){ + + wxSPhotoURI = wSTDataType.GetNextToken(); + wxSPhotoMIME = wSTDataType.GetNextToken(); + break; + + } + + wxStringTokenizer wSTDataInfo(PropertySeg2.Mid((striter->second + 1)), wxT(",")); + + while (wSTDataInfo.HasMoreTokens() == TRUE){ + + wxSPhotoEncoding = wSTDataInfo.GetNextToken(); + wxSPhotoData = wSTDataInfo.GetNextToken(); + base64enc = wxSPhotoData.mb_str(); + break; + + } + + } + + // Add the data to the General/Home/Work address variables. + + PicturesList.insert(std::make_pair(*PhotoCount, base64enc)); + PicturesListPictureType.insert(std::make_pair(*PhotoCount, wxSPhotoMIME)); + PicturesListPicEncType.insert(std::make_pair(*PhotoCount, wxSPhotoEncoding)); + + switch(PropType){ + case PROPERTY_NONE: + break; + case PROPERTY_HOME: + PicturesListType.insert(std::make_pair(*PhotoCount, "home")); + break; + case PROPERTY_WORK: + PicturesListType.insert(std::make_pair(*PhotoCount, "work")); + break; + } + + if (!PropertyTokens.IsEmpty()){ + + PicturesListTokens.insert(std::make_pair(*PhotoCount, PropertyTokens)); + + } + +} + +void ContactDataObject::ProcessLogo(wxString PropertySeg1, wxString PropertySeg2, int *LogoCount){ size_t intPropertyLen = PropertySeg1.Len(); std::map SplitPoints; @@ -4094,13 +4605,13 @@ void ContactDataObject::ProcessPhoto(wxString PropertySeg1, wxString PropertySeg bool FirstToken = TRUE; int intSplitsFound = 0; int intSplitSize = 0; - int intPrevValue = 7; + int intPrevValue = 6; int intPref = 0; int intType = 0; SplitValues(&PropertySeg1, &SplitPoints, &SplitLength, intPrevValue); - intPrevValue = 6; + intPrevValue = 5; PropertyType PropType = PROPERTY_NONE; @@ -4108,7 +4619,7 @@ void ContactDataObject::ProcessPhoto(wxString PropertySeg1, wxString PropertySeg CheckType(&PropertySeg1, &SplitPoints, &SplitLength, &intPrevValue, &PropType); - intPrevValue = 6; + intPrevValue = 5; for (std::map::iterator intiter = SplitPoints.begin(); intiter != SplitPoints.end(); ++intiter){ @@ -4144,13 +4655,13 @@ void ContactDataObject::ProcessPhoto(wxString PropertySeg1, wxString PropertySeg if (PropertyName == wxT("ALTID")){ - PicturesListAltID.erase(*PhotoCount); - PicturesListAltID.insert(std::make_pair(*PhotoCount, PropertyValue)); + LogosListAltID.erase(*LogoCount); + LogosListAltID.insert(std::make_pair(*LogoCount, PropertyValue)); } else if (PropertyName == wxT("PID")){ - PicturesListPID.erase(*PhotoCount); - PicturesListPID.insert(std::make_pair(*PhotoCount, PropertyValue)); + LogosListPID.erase(*LogoCount); + LogosListPID.insert(std::make_pair(*LogoCount, PropertyValue)); } else if (PropertyName == wxT("PREF")){ @@ -4167,15 +4678,15 @@ void ContactDataObject::ProcessPhoto(wxString PropertySeg1, wxString PropertySeg if (ValidNumber == TRUE){ - PicturesListPref.erase(*PhotoCount); - PicturesListPref.insert(std::make_pair(*PhotoCount, PriorityNumber)); + LogosListPref.erase(*LogoCount); + LogosListPref.insert(std::make_pair(*LogoCount, PriorityNumber)); } } else if (PropertyName == wxT("MEDIATYPE")){ - PicturesListMediatype.erase(*PhotoCount); - PicturesListMediatype.insert(std::make_pair(*PhotoCount, PropertyValue)); + LogosListMediatype.erase(*LogoCount); + LogosListMediatype.insert(std::make_pair(*LogoCount, PropertyValue)); } else { @@ -4275,30 +4786,30 @@ void ContactDataObject::ProcessPhoto(wxString PropertySeg1, wxString PropertySeg // Add the data to the General/Home/Work address variables. - PicturesList.insert(std::make_pair(*PhotoCount, base64enc)); - PicturesListPictureType.insert(std::make_pair(*PhotoCount, wxSPhotoMIME)); - PicturesListPicEncType.insert(std::make_pair(*PhotoCount, wxSPhotoEncoding)); + LogosList.insert(std::make_pair(*LogoCount, base64enc)); + LogosListPictureType.insert(std::make_pair(*LogoCount, wxSPhotoMIME)); + LogosListPicEncType.insert(std::make_pair(*LogoCount, wxSPhotoEncoding)); switch(PropType){ case PROPERTY_NONE: break; case PROPERTY_HOME: - PicturesListType.insert(std::make_pair(*PhotoCount, "home")); + LogosListType.insert(std::make_pair(*LogoCount, "home")); break; case PROPERTY_WORK: - PicturesListType.insert(std::make_pair(*PhotoCount, "work")); + LogosListType.insert(std::make_pair(*LogoCount, "work")); break; } if (!PropertyTokens.IsEmpty()){ - PicturesListTokens.insert(std::make_pair(*PhotoCount, PropertyTokens)); + LogosListTokens.insert(std::make_pair(*LogoCount, PropertyTokens)); } } -void ContactDataObject::ProcessLogo(wxString PropertySeg1, wxString PropertySeg2, int *LogoCount){ +void ContactDataObject::ProcessSound(wxString PropertySeg1, wxString PropertySeg2, int *SoundCount){ size_t intPropertyLen = PropertySeg1.Len(); std::map SplitPoints; @@ -4311,21 +4822,21 @@ void ContactDataObject::ProcessLogo(wxString PropertySeg1, wxString PropertySeg2 bool FirstToken = TRUE; int intSplitsFound = 0; int intSplitSize = 0; - int intPrevValue = 6; + int intPrevValue = 7; int intPref = 0; int intType = 0; SplitValues(&PropertySeg1, &SplitPoints, &SplitLength, intPrevValue); - intPrevValue = 5; + intPrevValue = 6; PropertyType PropType = PROPERTY_NONE; - - // Look for type before continuing. + // Look for type before continuing. + CheckType(&PropertySeg1, &SplitPoints, &SplitLength, &intPrevValue, &PropType); - intPrevValue = 5; + intPrevValue = 6; for (std::map::iterator intiter = SplitPoints.begin(); intiter != SplitPoints.end(); ++intiter){ @@ -4355,19 +4866,19 @@ void ContactDataObject::ProcessLogo(wxString PropertySeg1, wxString PropertySeg2 PropertyValue.Remove(0, 1); - } + } CaptureString(&PropertyValue, FALSE); if (PropertyName == wxT("ALTID")){ - LogosListAltID.erase(*LogoCount); - LogosListAltID.insert(std::make_pair(*LogoCount, PropertyValue)); + SoundsListAltID.erase(*SoundCount); + SoundsListAltID.insert(std::make_pair(*SoundCount, PropertyValue)); } else if (PropertyName == wxT("PID")){ - LogosListPID.erase(*LogoCount); - LogosListPID.insert(std::make_pair(*LogoCount, PropertyValue)); + SoundsListPID.erase(*SoundCount); + SoundsListPID.insert(std::make_pair(*SoundCount, PropertyValue)); } else if (PropertyName == wxT("PREF")){ @@ -4384,16 +4895,21 @@ void ContactDataObject::ProcessLogo(wxString PropertySeg1, wxString PropertySeg2 if (ValidNumber == TRUE){ - LogosListPref.erase(*LogoCount); - LogosListPref.insert(std::make_pair(*LogoCount, PriorityNumber)); + SoundsListPref.erase(*SoundCount); + SoundsListPref.insert(std::make_pair(*SoundCount, PriorityNumber)); } } else if (PropertyName == wxT("MEDIATYPE")){ - LogosListMediatype.erase(*LogoCount); - LogosListMediatype.insert(std::make_pair(*LogoCount, PropertyValue)); - + SoundsListMediatype.erase(*SoundCount); + SoundsListMediatype.insert(std::make_pair(*SoundCount, PropertyValue)); + + } else if (PropertyName == wxT("LANGUAGE")){ + + SoundsListLanguage.erase(*SoundCount); + SoundsListLanguage.insert(std::make_pair(*SoundCount, PropertyValue)); + } else { // Something else we don't know about so append @@ -4423,7 +4939,7 @@ void ContactDataObject::ProcessLogo(wxString PropertySeg1, wxString PropertySeg2 SplitLength.clear(); intSplitsFound = 0; intSplitSize = 0; - intPrevValue = 0; + intPrevValue = 0; CaptureString(&PropertySeg2, FALSE); @@ -4453,10 +4969,10 @@ void ContactDataObject::ProcessLogo(wxString PropertySeg1, wxString PropertySeg2 } - wxString wxSPhotoURI; - wxString wxSPhotoMIME; - wxString wxSPhotoEncoding; - wxString wxSPhotoData; + wxString wxSSoundURI; + wxString wxSSoundMIME; + wxString wxSSoundEncoding; + wxString wxSSoundData; std::string base64enc; if (intSplitsFound == 0){ @@ -4471,8 +4987,8 @@ void ContactDataObject::ProcessLogo(wxString PropertySeg1, wxString PropertySeg2 while (wSTDataType.HasMoreTokens() == TRUE){ - wxSPhotoURI = wSTDataType.GetNextToken(); - wxSPhotoMIME = wSTDataType.GetNextToken(); + wxSSoundURI = wSTDataType.GetNextToken(); + wxSSoundMIME = wSTDataType.GetNextToken(); break; } @@ -4481,9 +4997,9 @@ void ContactDataObject::ProcessLogo(wxString PropertySeg1, wxString PropertySeg2 while (wSTDataInfo.HasMoreTokens() == TRUE){ - wxSPhotoEncoding = wSTDataInfo.GetNextToken(); - wxSPhotoData = wSTDataInfo.GetNextToken(); - base64enc = wxSPhotoData.mb_str(); + wxSSoundEncoding = wSTDataInfo.GetNextToken(); + wxSSoundData = wSTDataInfo.GetNextToken(); + base64enc = wxSSoundData.mb_str(); break; } @@ -4491,31 +5007,183 @@ void ContactDataObject::ProcessLogo(wxString PropertySeg1, wxString PropertySeg2 } // Add the data to the General/Home/Work address variables. + + switch(PropType){ + case PROPERTY_NONE: + break; + case PROPERTY_HOME: + SoundsListType.insert(std::make_pair(*SoundCount, "home")); + break; + case PROPERTY_WORK: + SoundsListType.insert(std::make_pair(*SoundCount, "work")); + break; + } - LogosList.insert(std::make_pair(*LogoCount, base64enc)); - LogosListPictureType.insert(std::make_pair(*LogoCount, wxSPhotoMIME)); - LogosListPicEncType.insert(std::make_pair(*LogoCount, wxSPhotoEncoding)); + 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; + + for (std::map::iterator intiter = SplitPoints.begin(); + intiter != SplitPoints.end(); ++intiter){ + + SLiter = SplitLength.find(intiter->first); + + PropertyData = PropertySeg1.Mid(intPrevValue, (SLiter->second)); + + wxStringTokenizer PropertyElement (PropertyData, wxT("=")); + PropertyName = PropertyElement.GetNextToken(); + PropertyValue = PropertyElement.GetNextToken(); + + intPrevValue = intiter->second; + + // Process properties. + + size_t intPropertyValueLen = PropertyValue.Len(); + + if (PropertyValue.Mid((intPropertyValueLen - 1), 1) == wxT("\"")){ + + PropertyValue.Trim(); + PropertyValue.RemoveLast(); + + } + + if (PropertyValue.Mid(0, 1) == wxT("\"")){ + + PropertyValue.Remove(0, 1); + + } + + CaptureString(&PropertyValue, FALSE); + + if (PropertyName == wxT("ALTID")){ + + CalendarListAltID.erase(*CalURICount); + CalendarListAltID.insert(std::make_pair(*CalURICount, PropertyValue)); + + } else if (PropertyName == wxT("PID")){ + + 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){ + + CalendarListPref.erase(*CalURICount); + CalendarListPref.insert(std::make_pair(*CalURICount, PriorityNumber)); + + } + + } 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){ + + 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: - LogosListType.insert(std::make_pair(*LogoCount, "home")); + CalendarListType.insert(std::make_pair(*CalURICount, "home")); break; case PROPERTY_WORK: - LogosListType.insert(std::make_pair(*LogoCount, "work")); + CalendarListType.insert(std::make_pair(*CalURICount, "work")); break; } + CalendarList.insert(std::make_pair(*CalURICount, PropertySeg2)); + if (!PropertyTokens.IsEmpty()){ - - LogosListTokens.insert(std::make_pair(*LogoCount, PropertyTokens)); + + CalendarListTokens.insert(std::make_pair(*CalURICount, PropertyTokens)); } } -void ContactDataObject::ProcessSound(wxString PropertySeg1, wxString PropertySeg2, int *SoundCount){ +void ContactDataObject::ProcessCalendarAddressURI(wxString PropertySeg1, wxString PropertySeg2, int *CalAdrURICount){ size_t intPropertyLen = PropertySeg1.Len(); std::map SplitPoints; @@ -4528,13 +5196,13 @@ void ContactDataObject::ProcessSound(wxString PropertySeg1, wxString PropertySeg bool FirstToken = TRUE; int intSplitsFound = 0; int intSplitSize = 0; - int intPrevValue = 7; + int intPrevValue = 8; int intPref = 0; int intType = 0; SplitValues(&PropertySeg1, &SplitPoints, &SplitLength, intPrevValue); - intPrevValue = 6; + intPrevValue = 7; PropertyType PropType = PROPERTY_NONE; @@ -4542,7 +5210,7 @@ void ContactDataObject::ProcessSound(wxString PropertySeg1, wxString PropertySeg CheckType(&PropertySeg1, &SplitPoints, &SplitLength, &intPrevValue, &PropType); - intPrevValue = 6; + intPrevValue = 7; for (std::map::iterator intiter = SplitPoints.begin(); intiter != SplitPoints.end(); ++intiter){ @@ -4578,13 +5246,13 @@ void ContactDataObject::ProcessSound(wxString PropertySeg1, wxString PropertySeg if (PropertyName == wxT("ALTID")){ - SoundsListAltID.erase(*SoundCount); - SoundsListAltID.insert(std::make_pair(*SoundCount, PropertyValue)); + CalendarRequestListAltID.erase(*CalAdrURICount); + CalendarRequestListAltID.insert(std::make_pair(*CalAdrURICount, PropertyValue)); } else if (PropertyName == wxT("PID")){ - SoundsListPID.erase(*SoundCount); - SoundsListPID.insert(std::make_pair(*SoundCount, PropertyValue)); + CalendarRequestListPID.erase(*CalAdrURICount); + CalendarRequestListPID.insert(std::make_pair(*CalAdrURICount, PropertyValue)); } else if (PropertyName == wxT("PREF")){ @@ -4601,20 +5269,15 @@ void ContactDataObject::ProcessSound(wxString PropertySeg1, wxString PropertySeg if (ValidNumber == TRUE){ - SoundsListPref.erase(*SoundCount); - SoundsListPref.insert(std::make_pair(*SoundCount, PriorityNumber)); + CalendarRequestListPref.erase(*CalAdrURICount); + CalendarRequestListPref.insert(std::make_pair(*CalAdrURICount, PriorityNumber)); } } else if (PropertyName == wxT("MEDIATYPE")){ - SoundsListMediatype.erase(*SoundCount); - SoundsListMediatype.insert(std::make_pair(*SoundCount, PropertyValue)); - - } else if (PropertyName == wxT("LANGUAGE")){ - - SoundsListLanguage.erase(*SoundCount); - SoundsListLanguage.insert(std::make_pair(*SoundCount, PropertyValue)); + CalendarRequestListMediatype.erase(*CalAdrURICount); + CalendarRequestListMediatype.insert(std::make_pair(*CalAdrURICount, PropertyValue)); } else { @@ -4649,95 +5312,30 @@ void ContactDataObject::ProcessSound(wxString PropertySeg1, wxString PropertySeg CaptureString(&PropertySeg2, FALSE); - for (int i = 0; i <= intPropertyLen; i++){ - - intSplitSize++; - - if (PropertySeg2.Mid(i, 1) == wxT(";")){ - - intSplitsFound++; - SplitPoints.insert(std::make_pair(intSplitsFound, (i + 1))); - - if (intSplitsFound == 6){ - - SplitLength.insert(std::make_pair(intSplitsFound, (intSplitSize - 1))); - break; - - } else { - - SplitLength.insert(std::make_pair(intSplitsFound, (intSplitSize - 1))); - - } - - intSplitSize = 0; - - } - - } - - wxString wxSSoundURI; - wxString wxSSoundMIME; - wxString wxSSoundEncoding; - wxString wxSSoundData; - std::string base64enc; - - if (intSplitsFound == 0){ - - } else { - - std::map::iterator striter; - - striter = SplitLength.find(1); - - wxStringTokenizer wSTDataType(PropertySeg2.Mid(0, striter->second), wxT(":")); - - while (wSTDataType.HasMoreTokens() == TRUE){ - - wxSSoundURI = wSTDataType.GetNextToken(); - wxSSoundMIME = wSTDataType.GetNextToken(); - break; - - } - - wxStringTokenizer wSTDataInfo(PropertySeg2.Mid((striter->second + 1)), wxT(",")); - - while (wSTDataInfo.HasMoreTokens() == TRUE){ - - wxSSoundEncoding = wSTDataInfo.GetNextToken(); - wxSSoundData = wSTDataInfo.GetNextToken(); - base64enc = wxSSoundData.mb_str(); - break; - - } - - } - // Add the data to the General/Home/Work address variables. switch(PropType){ case PROPERTY_NONE: break; case PROPERTY_HOME: - SoundsListType.insert(std::make_pair(*SoundCount, "home")); + CalendarRequestListType.insert(std::make_pair(*CalAdrURICount, "home")); break; case PROPERTY_WORK: - SoundsListType.insert(std::make_pair(*SoundCount, "work")); + CalendarRequestListType.insert(std::make_pair(*CalAdrURICount, "work")); break; } - SoundsList.insert(std::make_pair(*SoundCount, base64enc)); - SoundsListAudioEncType.insert(std::make_pair(*SoundCount, wxSSoundEncoding)); - SoundsListAudioType.insert(std::make_pair(*SoundCount, wxSSoundMIME)); + CalendarRequestList.insert(std::make_pair(*CalAdrURICount, PropertySeg2)); if (!PropertyTokens.IsEmpty()){ - SoundsListTokens.insert(std::make_pair(*SoundCount, PropertyTokens)); + CalendarRequestListTokens.insert(std::make_pair(*CalAdrURICount, PropertyTokens)); - } + } } -void ContactDataObject::ProcessCalendarURI(wxString PropertySeg1, wxString PropertySeg2, int *CalURICount){ +void ContactDataObject::ProcessCalendarFreeBusy(wxString PropertySeg1, wxString PropertySeg2, int *FreeBusyAddressCount){ size_t intPropertyLen = PropertySeg1.Len(); std::map SplitPoints; @@ -4750,13 +5348,13 @@ void ContactDataObject::ProcessCalendarURI(wxString PropertySeg1, wxString Prope bool FirstToken = TRUE; int intSplitsFound = 0; int intSplitSize = 0; - int intPrevValue = 8; + int intPrevValue = 7; int intPref = 0; int intType = 0; SplitValues(&PropertySeg1, &SplitPoints, &SplitLength, intPrevValue); - intPrevValue = 7; + intPrevValue = 6; PropertyType PropType = PROPERTY_NONE; @@ -4764,7 +5362,7 @@ void ContactDataObject::ProcessCalendarURI(wxString PropertySeg1, wxString Prope CheckType(&PropertySeg1, &SplitPoints, &SplitLength, &intPrevValue, &PropType); - intPrevValue = 7; + intPrevValue = 6; for (std::map::iterator intiter = SplitPoints.begin(); intiter != SplitPoints.end(); ++intiter){ @@ -4800,13 +5398,13 @@ void ContactDataObject::ProcessCalendarURI(wxString PropertySeg1, wxString Prope if (PropertyName == wxT("ALTID")){ - CalendarListAltID.erase(*CalURICount); - CalendarListAltID.insert(std::make_pair(*CalURICount, PropertyValue)); + FreeBusyListAltID.erase(*FreeBusyAddressCount); + FreeBusyListAltID.insert(std::make_pair(*FreeBusyAddressCount, PropertyValue)); } else if (PropertyName == wxT("PID")){ - CalendarListPID.erase(*CalURICount); - CalendarListPID.insert(std::make_pair(*CalURICount, PropertyValue)); + FreeBusyListPID.erase(*FreeBusyAddressCount); + FreeBusyListPID.insert(std::make_pair(*FreeBusyAddressCount, PropertyValue)); } else if (PropertyName == wxT("PREF")){ @@ -4823,15 +5421,15 @@ void ContactDataObject::ProcessCalendarURI(wxString PropertySeg1, wxString Prope if (ValidNumber == TRUE){ - CalendarListPref.erase(*CalURICount); - CalendarListPref.insert(std::make_pair(*CalURICount, PriorityNumber)); + FreeBusyListPref.erase(*FreeBusyAddressCount); + FreeBusyListPref.insert(std::make_pair(*FreeBusyAddressCount, PriorityNumber)); } } else if (PropertyName == wxT("MEDIATYPE")){ - CalendarListMediatype.erase(*CalURICount); - CalendarListMediatype.insert(std::make_pair(*CalURICount, PropertyValue)); + FreeBusyListMediatype.erase(*FreeBusyAddressCount); + FreeBusyListMediatype.insert(std::make_pair(*FreeBusyAddressCount, PropertyValue)); } else { @@ -4872,24 +5470,24 @@ void ContactDataObject::ProcessCalendarURI(wxString PropertySeg1, wxString Prope case PROPERTY_NONE: break; case PROPERTY_HOME: - CalendarListType.insert(std::make_pair(*CalURICount, "home")); + FreeBusyListType.insert(std::make_pair(*FreeBusyAddressCount, "home")); break; case PROPERTY_WORK: - CalendarListType.insert(std::make_pair(*CalURICount, "work")); + FreeBusyListType.insert(std::make_pair(*FreeBusyAddressCount, "work")); break; } - CalendarList.insert(std::make_pair(*CalURICount, PropertySeg2)); + FreeBusyList.insert(std::make_pair(*FreeBusyAddressCount, PropertySeg2)); if (!PropertyTokens.IsEmpty()){ - CalendarListTokens.insert(std::make_pair(*CalURICount, PropertyTokens)); + FreeBusyListTokens.insert(std::make_pair(*FreeBusyAddressCount, PropertyTokens)); } } -void ContactDataObject::ProcessCalendarAddressURI(wxString PropertySeg1, wxString PropertySeg2, int *CalAdrURICount){ +void ContactDataObject::ProcessKey(wxString PropertySeg1, wxString PropertySeg2, int *KeyCount){ size_t intPropertyLen = PropertySeg1.Len(); std::map SplitPoints; @@ -4902,21 +5500,22 @@ void ContactDataObject::ProcessCalendarAddressURI(wxString PropertySeg1, wxStrin bool FirstToken = TRUE; int intSplitsFound = 0; int intSplitSize = 0; - int intPrevValue = 8; + int intPrevValue = 5; int intPref = 0; int intType = 0; + long ListCtrlIndex; SplitValues(&PropertySeg1, &SplitPoints, &SplitLength, intPrevValue); - intPrevValue = 7; + intPrevValue = 4; PropertyType PropType = PROPERTY_NONE; - // Look for type before continuing. + // Look for type before continuing. CheckType(&PropertySeg1, &SplitPoints, &SplitLength, &intPrevValue, &PropType); - intPrevValue = 7; + intPrevValue = 4; for (std::map::iterator intiter = SplitPoints.begin(); intiter != SplitPoints.end(); ++intiter){ @@ -4946,19 +5545,17 @@ void ContactDataObject::ProcessCalendarAddressURI(wxString PropertySeg1, wxStrin PropertyValue.Remove(0, 1); - } - - CaptureString(&PropertyValue, FALSE); + } if (PropertyName == wxT("ALTID")){ - CalendarRequestListAltID.erase(*CalAdrURICount); - CalendarRequestListAltID.insert(std::make_pair(*CalAdrURICount, PropertyValue)); + KeyListAltID.erase(*KeyCount); + KeyListAltID.insert(std::make_pair(*KeyCount, PropertyValue)); } else if (PropertyName == wxT("PID")){ - CalendarRequestListPID.erase(*CalAdrURICount); - CalendarRequestListPID.insert(std::make_pair(*CalAdrURICount, PropertyValue)); + KeyListPID.erase(*KeyCount); + KeyListPID.insert(std::make_pair(*KeyCount, PropertyValue)); } else if (PropertyName == wxT("PREF")){ @@ -4975,16 +5572,11 @@ void ContactDataObject::ProcessCalendarAddressURI(wxString PropertySeg1, wxStrin if (ValidNumber == TRUE){ - CalendarRequestListPref.erase(*CalAdrURICount); - CalendarRequestListPref.insert(std::make_pair(*CalAdrURICount, PriorityNumber)); + KeyListPref.erase(*KeyCount); + KeyListPref.insert(std::make_pair(*KeyCount, PriorityNumber)); } - } 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 @@ -5007,38 +5599,179 @@ void ContactDataObject::ProcessCalendarAddressURI(wxString PropertySeg1, wxStrin } - } + } intPropertyLen = PropertySeg2.Len(); SplitPoints.clear(); SplitLength.clear(); intSplitsFound = 0; intSplitSize = 0; - intPrevValue = 0; + intPrevValue = 0; - CaptureString(&PropertySeg2, FALSE); + for (int i = 0; i <= intPropertyLen; i++){ + + intSplitSize++; + + if (PropertySeg2.Mid(i, 1) == wxT(";") && PropertySeg2.Mid((i - 1), 1) != wxT("\\")){ + + intSplitsFound++; + SplitPoints.insert(std::make_pair(intSplitsFound, (i + 1))); + + if (intSplitsFound == 6){ + + SplitLength.insert(std::make_pair(intSplitsFound, (intSplitSize - 1))); + break; + + } else { + + SplitLength.insert(std::make_pair(intSplitsFound, (intSplitSize - 1))); + + } + + intSplitSize = 0; + + } + + } + + wxString wxSKeyURI; + wxString wxSKeyMIME; + wxString wxSKeyEncoding; + wxString wxSKeyData; + std::string base64enc; + + if (intSplitsFound == 0){ + + } else { + + std::map::iterator striter; + + striter = SplitLength.find(1); + + wxStringTokenizer wSTDataType(PropertySeg2.Mid(0, striter->second), wxT(":")); + + while (wSTDataType.HasMoreTokens() == TRUE){ + + wxSKeyURI = wSTDataType.GetNextToken(); + wxSKeyMIME = wSTDataType.GetNextToken(); + break; + + } + + if (wxSKeyURI == wxT("data")){ + + wxStringTokenizer wSTDataInfo(PropertySeg2.Mid((striter->second + 1)), wxT(",")); + + while (wSTDataInfo.HasMoreTokens() == TRUE){ + + wxSKeyEncoding = wSTDataInfo.GetNextToken(); + wxSKeyData = wSTDataInfo.GetNextToken(); + break; + + } + + } + + } // Add the data to the General/Home/Work address variables. + + if (wxSKeyURI == wxT("data")){ - switch(PropType){ + KeyListDataEncType.erase(*KeyCount); + KeyListKeyType.erase(*KeyCount); + KeyListDataEncType.insert(std::make_pair(*KeyCount, wxSKeyEncoding)); + KeyListKeyType.insert(std::make_pair(*KeyCount, TRUE)); + + KeyList.erase(*KeyCount); + KeyList.insert(std::make_pair(*KeyCount, wxSKeyData)); + + } else { + + KeyList.erase(*KeyCount); + KeyList.insert(std::make_pair(*KeyCount, PropertySeg2)); + + } + + KeyListDataType.insert(std::make_pair(*KeyCount, wxSKeyMIME)); + + switch (PropType){ case PROPERTY_NONE: break; - case PROPERTY_HOME: - CalendarRequestListType.insert(std::make_pair(*CalAdrURICount, "home")); + case PROPERTY_HOME: + KeyListType.insert(std::make_pair(*KeyCount, wxT("home"))); break; - case PROPERTY_WORK: - CalendarRequestListType.insert(std::make_pair(*CalAdrURICount, "work")); + case PROPERTY_WORK: + KeyListType.insert(std::make_pair(*KeyCount, wxT("work"))); break; } + + if (!PropertyTokens.IsEmpty()){ + + KeyListTokens.insert(std::make_pair(*KeyCount, PropertyTokens)); + + } + +} + +void ContactDataObject::ProcessVendor(wxString PropertySeg1, wxString PropertySeg2, int *VendorCount){ + + // Split the Vendor three ways. - CalendarRequestList.insert(std::make_pair(*CalAdrURICount, PropertySeg2)); + wxStringTokenizer wSTVendorDetails(PropertySeg1, wxT("-")); - if (!PropertyTokens.IsEmpty()){ + wxString wxSVNDID; + wxString wxSVNDPropName; + long ListCtrlIndex; + + while (wSTVendorDetails.HasMoreTokens() == TRUE){ - CalendarRequestListTokens.insert(std::make_pair(*CalAdrURICount, PropertyTokens)); + wSTVendorDetails.GetNextToken(); + wxSVNDID = wSTVendorDetails.GetNextToken(); + wxSVNDPropName = wSTVendorDetails.GetNextToken(); + break; - } + } + + if (!wxSVNDID.IsEmpty() && !wxSVNDPropName.IsEmpty()){ + + // Add the data to the vendor variables. + VendorList.erase(*VendorCount); + VendorListPEN.erase(*VendorCount); + VendorListElement.erase(*VendorCount); + + VendorList.insert(std::make_pair(*VendorCount, PropertySeg2)); + VendorListPEN.insert(std::make_pair(*VendorCount, wxSVNDID)); + VendorListElement.insert(std::make_pair(*VendorCount, wxSVNDPropName)); + + } + +} + +void ProcessIntegerValue(ContactDataObject *ContactData, + 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)); + + } + } void SplitValues(wxString *PropertyLine,