X-Git-Url: http://Server1/repobrowser/?a=blobdiff_plain;f=source%2Fobjects%2Fcalendarevent%2FCalendarEvent.cpp;h=06231778859c4e538586c9e9e05f629fc68cc5f8;hb=debbed6605987283457cd1c6f72a1d4b3abff192;hp=55d96045bee70ea061bb4395c415c48b76d1e6e0;hpb=bdb4703c0b58dabb95a21bc62541514708ddd641;p=xestiacalendar%2F.git

diff --git a/source/objects/calendarevent/CalendarEvent.cpp b/source/objects/calendarevent/CalendarEvent.cpp
index 55d9604..0623177 100644
--- a/source/objects/calendarevent/CalendarEvent.cpp
+++ b/source/objects/calendarevent/CalendarEvent.cpp
@@ -665,24 +665,6 @@ void CalendarEventObject::ProcessData(){
 		
 	}
 	
-	// Process the data from TRANSP.
-	
-	DataReceived = ProcessTextVectors(&ObjectName, &ObjectData, false, "TRANSP");
-	
-	if (DataReceived.begin() != DataReceived.end()){
-	
-		try {
-			TimeTransparencyDataTokens = DataReceived.begin()->first.substr(7);
-		}
-		
-		catch(const out_of_range &oor){
-			// Do nothing as there is no data.
-		}		
-		
-		TimeTransparencyData = DataReceived.begin()->second;
-		
-	}
-	
 	// Process the data from URL.
 	
 	DataReceived = ProcessTextVectors(&ObjectName, &ObjectData, false, "URL");
@@ -755,4 +737,74 @@ void CalendarEventObject::ProcessData(){
 		
 	}
 	
+	// Process the data from RRULE.
+	
+	DataReceived = ProcessTextVectors(&ObjectName, &ObjectData, false, "RRULE");
+	
+	if (DataReceived.begin() != DataReceived.end()){
+	
+		try {
+			RecurranceRuleDataTokens = DataReceived.begin()->first.substr(6);
+		}
+		
+		catch(const out_of_range &oor){
+			// Do nothing as there is no data.
+		}		
+		
+		RecurranceRuleData = DataReceived.begin()->second;
+		
+	}
+	
+	// Process the data from DTEND.
+	
+	bool DateTimeEndProcessed = false;
+	
+	DataReceived = ProcessTextVectors(&ObjectName, &ObjectData, false, "DTEND");
+	
+	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 == "VALUE"){
+				
+				DateTimeEndDataValue = iter->second;
+				
+			} else if (iter->first == "TZID"){
+				
+				DateTimeEndDataTimeZoneID = iter->second;
+				
+			} else {
+				
+				if (TokenData == false){
+					TokenData = true;
+				} else {
+					PropertyTokens += ";";
+				}
+				
+				PropertyTokens += iter->first;
+				PropertyTokens += "=";
+				PropertyTokens += iter->second;
+				
+			}
+				
+		}
+		
+		if (PropertyTokens.size() > 0){
+			DateTimeEndDataTokens = PropertyTokens;
+		}
+		
+		DateTimeEndData = DataReceived.begin()->second;
+		
+		DateTimeEndProcessed = true;
+		
+	}
+	
 }