From e1894ab3390aad58b7f747e88b40cb856ddcbd7e Mon Sep 17 00:00:00 2001 From: Steve Brokenshire Date: Sun, 31 Jan 2016 14:45:46 +0000 Subject: [PATCH] Replaced LOCATION with ORGANIZER for CalendarJournalObject. --- .../calendarjournal/CalendarJournal.cpp | 22 +++++++++++++------ 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/source/objects/calendarjournal/CalendarJournal.cpp b/source/objects/calendarjournal/CalendarJournal.cpp index d8201dc..8a70db0 100644 --- a/source/objects/calendarjournal/CalendarJournal.cpp +++ b/source/objects/calendarjournal/CalendarJournal.cpp @@ -271,9 +271,9 @@ void CalendarJournalObject::ProcessData(){ } - // Process the data from LOCATION. + // Process the data from ORGANIZER. - DataReceived = ProcessTextVectors(&ObjectName, &ObjectData, false, "LOCATION"); + DataReceived = ProcessTextVectors(&ObjectName, &ObjectData, false, "ORGANIZER"); if (DataReceived.begin() != DataReceived.end()){ @@ -287,13 +287,21 @@ void CalendarJournalObject::ProcessData(){ for(map::iterator iter = PropertyData.begin(); iter != PropertyData.end(); iter++){ - if (iter->first == "ALTREP"){ + if (iter->first == "CN"){ - LocationDataAltRep = iter->second; + OrganiserDataCommonName = iter->second; + + } else if (iter->first == "DIR"){ + + OrganiserDataDirectoryEntry = iter->second; + + } else if (iter->first == "SENT-BY"){ + + OrganiserDataSentByParam = iter->second; } else if (iter->first == "LANGUAGE"){ - LocationDataLanguage = iter->second; + OrganiserDataLanguage = iter->second; } else { @@ -313,11 +321,11 @@ void CalendarJournalObject::ProcessData(){ if (PropertyTokens.size() > 0){ - LocationDataTokens = PropertyTokens; + OrganiserDataTokens = PropertyTokens; } - LocationData = DataReceived.begin()->second; + OrganiserData = DataReceived.begin()->second; } -- 2.39.2