X-Git-Url: http://Server1/repobrowser/?a=blobdiff_plain;f=source%2Fobjects%2Fcalendarevent%2FCalendarEvent.cpp;h=42b1a33de105f79276e4d691944419c6423c4836;hb=74b68f39d9ccf55221f07a31f14bd58cb11101d1;hp=df686a4b080aa5a3ea7609838d257bab93c7c00a;hpb=0e6ec9df1975e063c5f1cb7de1231b364570307a;p=xestiacalendar%2F.git

diff --git a/source/objects/calendarevent/CalendarEvent.cpp b/source/objects/calendarevent/CalendarEvent.cpp
index df686a4..42b1a33 100644
--- a/source/objects/calendarevent/CalendarEvent.cpp
+++ b/source/objects/calendarevent/CalendarEvent.cpp
@@ -665,39 +665,93 @@ void CalendarEventObject::ProcessData(){
 		
 	}
 	
-	// Process the data from TRANSP.
+	// Process the data from URL.
 	
-	DataReceived = ProcessTextVectors(&ObjectName, &ObjectData, false, "TRANSP");
+	DataReceived = ProcessTextVectors(&ObjectName, &ObjectData, false, "URL");
 	
 	if (DataReceived.begin() != DataReceived.end()){
 	
 		try {
-			TimeTransparencyDataTokens = DataReceived.begin()->first.substr(7);
+			URLDataTokens = DataReceived.begin()->first.substr(4);
 		}
 		
 		catch(const out_of_range &oor){
 			// Do nothing as there is no data.
 		}		
 		
-		TimeTransparencyData = DataReceived.begin()->second;
+		URLData = DataReceived.begin()->second;
 		
 	}
 	
-	// Process the data from URL.
+	// Process the data from RECURRENCE-ID.
 	
-	DataReceived = ProcessTextVectors(&ObjectName, &ObjectData, false, "URL");
+	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 RRULE.
+	
+	DataReceived = ProcessTextVectors(&ObjectName, &ObjectData, false, "RRULE");
 	
 	if (DataReceived.begin() != DataReceived.end()){
 	
 		try {
-			URLDataTokens = DataReceived.begin()->first.substr(4);
+			RecurranceRuleDataTokens = DataReceived.begin()->first.substr(6);
 		}
 		
 		catch(const out_of_range &oor){
 			// Do nothing as there is no data.
 		}		
 		
-		URLData = DataReceived.begin()->second;
+		RecurranceRuleData = DataReceived.begin()->second;
 		
 	}