X-Git-Url: http://Server1/repobrowser/?a=blobdiff_plain;f=source%2Fobjects%2Fcalendarevent%2FCalendarEvent.cpp;h=f737cc104e0fae217d764e7c22a75a7722bd59a6;hb=679177e983e748ab33ff6361dab881d3546d9948;hp=b266d191768407ddf56ef532de07ccf392decec4;hpb=a635d33edace32e152c96b25e364e3481850cb9f;p=xestiacalendar%2F.git

diff --git a/source/objects/calendarevent/CalendarEvent.cpp b/source/objects/calendarevent/CalendarEvent.cpp
index b266d19..f737cc1 100644
--- a/source/objects/calendarevent/CalendarEvent.cpp
+++ b/source/objects/calendarevent/CalendarEvent.cpp
@@ -8,6 +8,7 @@ CalendarObjectValidResult CalendarEventObject::ValidObject(){
 	bool ValidEnd = false;
 	bool ValidDateTimeStamp = false;
 	bool ValidUniqueID = false;
+	bool ValidDateTimeStart = false;
 	int SeekCount = 0;
 	string PropertyName;
 	
@@ -99,6 +100,41 @@ CalendarObjectValidResult CalendarEventObject::ValidObject(){
 	
 	SeekCount = 0;
 	
+	// Look for DTSTART if nothing is set for METHOD..
+	
+	if (MethodData.size() == 0){
+	
+		for (vector<string>::iterator iter = ObjectName.begin();
+			iter != ObjectName.end(); iter++){
+			
+			try{
+				PropertyName = ObjectName[SeekCount].substr(0,7);
+			}
+			
+			catch(const out_of_range& oor){
+				continue;
+			}
+		
+			if (PropertyName == "DTSTART"){
+			
+				if (ValidDateTimeStart == false){
+					ValidDateTimeStart = true;
+				} else {
+					return CALENDAROBJECTVALID_INVALIDFORMAT;
+				}
+				
+			}
+			
+			SeekCount++;
+			
+		}
+	
+	} else {
+		ValidDateTimeStart = true;
+	}
+	
+	SeekCount = 0;
+	
 	// Look for END:VEVENT.
 	
 	for (vector<string>::iterator iter = ObjectName.begin();
@@ -124,6 +160,7 @@ CalendarObjectValidResult CalendarEventObject::ValidObject(){
 	if (ValidBegin == true && 
 		ValidEnd == true && 
 		ValidDateTimeStamp == true &&
+		ValidDateTimeStart == true &&
 		ValidUniqueID == true){
 		
 		return CALENDAROBJECTVALID_OK;
@@ -146,7 +183,7 @@ void CalendarEventObject::ProcessData(){
 	
 	DataReceived = ProcessTextVectors(&ObjectName, &ObjectData, false, "DTSTAMP");
 	
-	// Process the data.
+	// Process the data from DTSTAMP.
 	
 	if (DataReceived.begin() != DataReceived.end()){
 	
@@ -161,5 +198,25 @@ void CalendarEventObject::ProcessData(){
 		DateTimeStampData = DataReceived.begin()->second;
 		
 	}
+
+	// Get the Unique ID (UID).
+	
+	DataReceived = ProcessTextVectors(&ObjectName, &ObjectData, false, "UID");
+	
+	// Process the data from UID.
+	
+	if (DataReceived.begin() != DataReceived.end()){
+	
+		try {
+			UniqueIDTokens = DataReceived.begin()->first.substr(4);
+		}
+		
+		catch(const out_of_range &oor){
+			// Do nothing as there is no data.
+		}		
+		
+		UniqueID = DataReceived.begin()->second;
+		
+	}
 	
 }