From: Steve Brokenshire <sbrokenshire@xestia.co.uk>
Date: Sun, 31 Jan 2016 14:45:46 +0000 (+0000)
Subject: Replaced LOCATION with ORGANIZER for CalendarJournalObject.
X-Git-Tag: release-0.02~486
X-Git-Url: http://Server1/repobrowser/?a=commitdiff_plain;h=e1894ab3390aad58b7f747e88b40cb856ddcbd7e;p=xestiacalendar%2F.git

Replaced LOCATION with ORGANIZER for CalendarJournalObject.
---

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<string,string>::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;
 		
 	}