Added unit tests for STATUS in iCalendarJournal/ObjectDataTests.

[xestiacalendar/.git] / source / objects / calendarjournal / CalendarJournal.cpp

diff --git a/source/objects/calendarjournal/CalendarJournal.cpp b/source/objects/calendarjournal/CalendarJournal.cpp
index d8201dc..dd920bc 100644 (file)
--- 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,145 @@ 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 {
+                               
+                               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 {
                                
@@ -313,11 +445,11 @@ void CalendarJournalObject::ProcessData(){
                
                if (PropertyTokens.size() > 0){
                        
-                       LocationDataTokens = PropertyTokens;
+                       StatusTokens = PropertyTokens;
                        
                }
                
-               LocationData = DataReceived.begin()->second;
+               StatusData = DataReceived.begin()->second;
                
        }