X-Git-Url: http://Server1/repobrowser/?a=blobdiff_plain;f=source%2Fobjects%2Fcalendarobject%2FCalendarObject.cpp;h=0925b45132e7938f53664de4a1bea8b3034b5324;hb=305cb89d6640707dae7100a654b8c232da093b32;hp=6ed8acdd1183af10099efdcfcdbb3d5268833c59;hpb=982b9393ccd85901f5edbb406526360962ac63d5;p=xestiacalendar%2F.git

diff --git a/source/objects/calendarobject/CalendarObject.cpp b/source/objects/calendarobject/CalendarObject.cpp
index 6ed8acd..0925b45 100644
--- a/source/objects/calendarobject/CalendarObject.cpp
+++ b/source/objects/calendarobject/CalendarObject.cpp
@@ -155,6 +155,9 @@ CalendarObjectLoadResult CalendarObject::LoadString(std::string *LoadStringData)
 		
 	}
 	
+	ProcessBaseData();
+	ProcessData();
+	
 	return StringProcResult;
 	
 }
@@ -182,7 +185,15 @@ CalendarObjectValidResult CalendarObject::ValidBaseObject(){
 			}
 				
 		}
-			
+		
+		if (ObjectName[SeekCount] == "END" &&
+			ObjectData[SeekCount] == "VCALENDAR" &&
+			ValidBegin == false){
+		
+			return CALENDAROBJECTVALID_INVALIDFORMAT;
+				
+		}
+		
 		SeekCount++;
 			
 	}
@@ -245,4 +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