From ba4b774febc0851a1fa351f8c08e2a3b03fa55b5 Mon Sep 17 00:00:00 2001 From: Steve Brokenshire Date: Mon, 28 Dec 2015 04:53:16 +0000 Subject: [PATCH] Replaced string processing in NOTE for ProcessStringValue. --- source/contacteditor/ContactDataObject.cpp | 47 ++++++++-------------- 1 file changed, 17 insertions(+), 30 deletions(-) diff --git a/source/contacteditor/ContactDataObject.cpp b/source/contacteditor/ContactDataObject.cpp index c697fc8..b164760 100644 --- a/source/contacteditor/ContactDataObject.cpp +++ b/source/contacteditor/ContactDataObject.cpp @@ -3639,6 +3639,7 @@ void ContactDataObject::ProcessNote(wxString PropertySeg1, wxString PropertySeg2 } intPrevValue = 5; + bool PropertyMatched = FALSE; for (std::map::iterator intiter = SplitPoints.begin(); intiter != SplitPoints.end(); ++intiter){ @@ -3672,45 +3673,31 @@ void ContactDataObject::ProcessNote(wxString PropertySeg1, wxString PropertySeg2 CaptureString(&PropertyValue, FALSE); - if (PropertyName == wxT("ALTID")){ + ProcessStringValue(&PropertyName, "ALTID", NoteListAltID, &PropertyValue, NoteCount, &PropertyMatched); + ProcessStringValue(&PropertyName, "PID", NoteListPID, &PropertyValue, NoteCount, &PropertyMatched); + ProcessStringValue(&PropertyName, "LANGUAGE", NoteListLanguage, &PropertyValue, NoteCount, &PropertyMatched); + ProcessIntegerValue(&PropertyName, "PREF", NoteListPref, &PropertyValue, NoteCount, &PropertyMatched); - NoteListAltID->erase(*NoteCount); - NoteListAltID->insert(std::make_pair(*NoteCount, PropertyValue)); + if (PropertyMatched == TRUE){ - } else if (PropertyName == wxT("PID")){ - - NoteListPID->erase(*NoteCount); - NoteListPID->insert(std::make_pair(*NoteCount, PropertyValue)); + PropertyMatched = FALSE; + continue; - } else if (PropertyName == wxT("PREF")){ + } - ProcessIntegerValue(NoteListPref, &PropertyValue, NoteCount); - - } else if (PropertyName == wxT("LANGUAGE")){ - - NoteListLanguage->erase(*NoteCount); - NoteListLanguage->insert(std::make_pair(*NoteCount, PropertyValue)); - - } else { + if (!PropertyName.IsEmpty() && !PropertyValue.IsEmpty() && PropertyName != wxT("TYPE")){ + + if (FirstToken == TRUE){ - // Something else we don't know about so append - // to the tokens variable. + PropertyTokens.Append(PropertyName + wxT("=") + PropertyValue); + FirstToken = FALSE; - if (!PropertyName.IsEmpty() && !PropertyValue.IsEmpty() && PropertyName != wxT("TYPE")){ + } else { - if (FirstToken == TRUE){ - - PropertyTokens.Append(PropertyName + wxT("=") + PropertyValue); - FirstToken = FALSE; - - } else { - - PropertyTokens.Append(wxT(";") + PropertyName + wxT("=") + PropertyValue); - - } + PropertyTokens.Append(wxT(";") + PropertyName + wxT("=") + PropertyValue); } - + } } -- 2.39.2