X-Git-Url: http://Server1/repobrowser/?a=blobdiff_plain;f=source%2Fobjects%2Fcalendarjournal%2FCalendarJournal.cpp;h=4312bcf538764bd7d46ba8b946f5f105972a8547;hb=500c60854b21599d281f1b0146cb5eee8332ffee;hp=d8201dc0f8553eea150a8af6fc978dc98375cf78;hpb=8c8555951ff40cb6b22e38480ca463f2136ed344;p=xestiacalendar%2F.git

diff --git a/source/objects/calendarjournal/CalendarJournal.cpp b/source/objects/calendarjournal/CalendarJournal.cpp
index d8201dc..4312bcf 100644
--- a/source/objects/calendarjournal/CalendarJournal.cpp
+++ b/source/objects/calendarjournal/CalendarJournal.cpp
@@ -271,9 +271,191 @@ 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()){
+	
+		bool TokenData = false;
+		string PropertyTokens;
+		
+		PropertyNameData = (string*)&DataReceived.begin()->first;
+		
+		PropertyData = SplitValues(*PropertyNameData);
+		
+		for(map<string,string>::iterator iter = PropertyData.begin();
+			iter != PropertyData.end(); iter++){
+			
+			if (iter->first == "CN"){
+				
+				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"){
+				
+				OrganiserDataLanguage = iter->second;
+				
+			} else {
+				
+				if (TokenData == false){
+					TokenData = true;
+				} else {
+					PropertyTokens += ";";
+				}
+				
+				PropertyTokens += iter->first;
+				PropertyTokens += "=";
+				PropertyTokens += iter->second;
+				
+			}
+				
+		}
+		
+		if (PropertyTokens.size() > 0){
+			
+			OrganiserDataTokens = PropertyTokens;
+			
+		}
+		
+		OrganiserData = DataReceived.begin()->second;
+		
+	}
+	
+	// Process the data from RECURRENCE-ID.
+	
+	DataReceived = ProcessTextVectors(&ObjectName, &ObjectData, false, "RECURRENCE-ID");
+	
+	if (DataReceived.begin() != DataReceived.end()){
+	
+		bool TokenData = false;
+		string PropertyTokens;
+		
+		PropertyNameData = (string*)&DataReceived.begin()->first;
+		
+		PropertyData = SplitValues(*PropertyNameData);
+		
+		for(map<string,string>::iterator iter = PropertyData.begin();
+			iter != PropertyData.end(); iter++){
+			
+			if (iter->first == "TZID"){
+				
+				RecurranceIDDataTimeZoneParam = iter->second;
+				
+			} else if (iter->first == "VALUE"){
+				
+				RecurranceIDDataValue = iter->second;
+				
+			} else if (iter->first == "RANGE"){
+				
+				RecurranceIDDataRangeParam = iter->second;
+				
+			} else {
+				
+				if (TokenData == false){
+					TokenData = true;
+				} else {
+					PropertyTokens += ";";
+				}
+				
+				PropertyTokens += iter->first;
+				PropertyTokens += "=";
+				PropertyTokens += iter->second;
+				
+			}
+				
+		}
+		
+		if (PropertyTokens.size() > 0){
+			
+			RecurranceIDDataTokens = PropertyTokens;
+			
+		}
+		
+		RecurranceIDData = DataReceived.begin()->second;
+		
+	}
+
+	// Process the data from SEQUENCE.
+	
+	DataReceived = ProcessTextVectors(&ObjectName, &ObjectData, false, "SEQUENCE");
+	
+	if (DataReceived.begin() != DataReceived.end()){
+	
+		try {
+			SequenceTokens = DataReceived.begin()->first.substr(9);
+		}
+		
+		catch(const out_of_range &oor){
+			// Do nothing as there is no data.
+		}		
+		
+		try {
+			SequenceData = stoi(DataReceived.begin()->second);
+		}
+		
+		catch(const invalid_argument &oor){
+			SequenceTokens.clear();
+		}
+		
+	}
+	
+	// Process the data from STATUS.
+	
+	DataReceived = ProcessTextVectors(&ObjectName, &ObjectData, false, "STATUS");
+	
+	if (DataReceived.begin() != DataReceived.end()){
+	
+		bool TokenData = false;
+		string PropertyTokens;
+		
+		PropertyNameData = (string*)&DataReceived.begin()->first;
+		
+		PropertyData = SplitValues(*PropertyNameData);
+		
+		for(map<string,string>::iterator iter = PropertyData.begin();
+			iter != PropertyData.end(); iter++){
+			
+			if (iter->first == "LANGUAGE"){
+				
+				StatusLanguage = iter->second;
+				
+			} else {
+				
+				if (TokenData == false){
+					TokenData = true;
+				} else {
+					PropertyTokens += ";";
+				}
+				
+				PropertyTokens += iter->first;
+				PropertyTokens += "=";
+				PropertyTokens += iter->second;
+				
+			}
+				
+		}
+		
+		if (PropertyTokens.size() > 0){
+			
+			StatusTokens = PropertyTokens;
+			
+		}
+		
+		StatusData = DataReceived.begin()->second;
+		
+	}
+	
+	// Process the data from SUMMARY.
+	
+	DataReceived = ProcessTextVectors(&ObjectName, &ObjectData, false, "SUMMARY");
 	
 	if (DataReceived.begin() != DataReceived.end()){
 	
@@ -289,11 +471,11 @@ void CalendarJournalObject::ProcessData(){
 			
 			if (iter->first == "ALTREP"){
 				
-				LocationDataAltRep = iter->second;
+				SummaryDataAltRep = iter->second;
 				
 			} else if (iter->first == "LANGUAGE"){
 				
-				LocationDataLanguage = iter->second;
+				SummaryDataLanguage = iter->second;
 				
 			} else {
 				
@@ -313,11 +495,29 @@ void CalendarJournalObject::ProcessData(){
 		
 		if (PropertyTokens.size() > 0){
 			
-			LocationDataTokens = PropertyTokens;
+			SummaryDataTokens = PropertyTokens;
 			
 		}
 		
-		LocationData = DataReceived.begin()->second;
+		SummaryData = DataReceived.begin()->second;
+		
+	}
+	
+	// Process the data from URL.
+	
+	DataReceived = ProcessTextVectors(&ObjectName, &ObjectData, false, "URL");
+	
+	if (DataReceived.begin() != DataReceived.end()){
+	
+		try {
+			URLDataTokens = DataReceived.begin()->first.substr(4);
+		}
+		
+		catch(const out_of_range &oor){
+			// Do nothing as there is no data.
+		}		
+		
+		URLData = DataReceived.begin()->second;
 		
 	}