Replace most RecurranceRuleData structure with RecurranceRuleDataTokens.

[xestiacalendar/.git] / source / objects / calendarevent / CalendarEvent.cpp

diff --git a/source/objects/calendarevent/CalendarEvent.cpp b/source/objects/calendarevent/CalendarEvent.cpp
index df686a4..42b1a33 100644 (file)
--- 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;
                
        }