Added ProcessBaseData subroutine for processing METHOD.

[xestiacalendar/.git] / source / objects / calendarobject / CalendarObject.cpp

diff --git a/source/objects/calendarobject/CalendarObject.cpp b/source/objects/calendarobject/CalendarObject.cpp
index 1178ad0..0925b45 100644 (file)
--- a/source/objects/calendarobject/CalendarObject.cpp
+++ b/source/objects/calendarobject/CalendarObject.cpp
@@ -144,6 +144,20 @@ CalendarObjectLoadResult CalendarObject::LoadString(std::string *LoadStringData)
        CalendarObjectValidResult BaseDataResult = ValidBaseObject();
        CalendarObjectValidResult EventDataResult = ValidObject();
        
+       if (BaseDataResult != CALENDAROBJECTVALID_OK || 
+               EventDataResult != CALENDAROBJECTVALID_OK){
+                       
+               StringProcResult = CALENDAROBJECTLOAD_INVALIDFORMAT;
+                       
+       } else {
+               
+               StringProcResult = CALENDAROBJECTLOAD_OK;
+               
+       }
+       
+       ProcessBaseData();
+       ProcessData();
+       
        return StringProcResult;
        
 }
@@ -171,7 +185,15 @@ CalendarObjectValidResult CalendarObject::ValidBaseObject(){
                        }
                                
                }
-                       
+               
+               if (ObjectName[SeekCount] == "END" &&
+                       ObjectData[SeekCount] == "VCALENDAR" &&
+                       ValidBegin == false){
+               
+                       return CALENDAROBJECTVALID_INVALIDFORMAT;
+                               
+               }
+               
                SeekCount++;
                        
        }
@@ -234,6 +256,30 @@ CalendarObjectValidResult CalendarObject::ValidBaseObject(){
                
        }
        
+}
 
+void CalendarObject::ProcessBaseData(){
+       
+       // Process the base object data.
+       
+       multimap<string,string> DataReceived;
+       
+       // Get the method (METHOD).
+       
+       DataReceived = ProcessTextVectors(&ObjectName, &ObjectData, false, "METHOD");
+       
+       if (DataReceived.begin() != DataReceived.end()){
+               
+               try {
+                       MethodTokens = DataReceived.begin()->first.substr(7);
+               }
+               
+               catch(const out_of_range &oor){
+                       // Do nothing as there is no data.
+               }               
+               
+               MethodData = DataReceived.begin()->second;
+               
+       }
        
 }
\ No newline at end of file