X-Git-Url: http://Server1/repobrowser/?a=blobdiff_plain;f=source%2Fobjects%2Fcalendarevent%2FCalendarEvent.cpp;h=b3f658dab18af4f51681525a68a87b25353f4a56;hb=2c9cd569e9892403582cda6ecb55bf95ad4e0f12;hp=7b3e3e28effbd4bae870924499e56e4588cfca5f;hpb=c1fba59390fa1c67aa9a6527fc031d4a6e2c5442;p=xestiacalendar%2F.git

diff --git a/source/objects/calendarevent/CalendarEvent.cpp b/source/objects/calendarevent/CalendarEvent.cpp
index 7b3e3e2..b3f658d 100644
--- a/source/objects/calendarevent/CalendarEvent.cpp
+++ b/source/objects/calendarevent/CalendarEvent.cpp
@@ -1454,9 +1454,7 @@ void CalendarEventObject::ProcessData(){
 		
 	}
 	
-	// Process Alarm section.
-	
-	ProcessAlarms();
+	// Process VALARM section.
 	
 	int SeekCount = 0;
 	int AlarmObjectCount = 0;
@@ -1474,6 +1472,7 @@ void CalendarEventObject::ProcessData(){
 		bool AlarmTriggerFound = false;
 		bool AlarmDurationFound = false;
 		bool AlarmDescriptionFound = false;
+		bool AlarmSummaryFound = false;
 			
 		DataReceived = ProcessTextVectors(&EventAlarmName[SeekCount], 
 				&EventAlarmData[SeekCount], false, "ACTION");
@@ -1920,6 +1919,14 @@ void CalendarEventObject::ProcessData(){
 
 			CalendarAlarmData.push_back(NewAlarmData);
 				
+		} else if (NewAlarmData.AlarmType == CALENDARALARM_EMAIL &&
+			AlarmActionFound == true &&
+			AlarmTriggerFound == true &&
+			AlarmDescriptionFound == true &&
+			AlarmSummaryFound == true){
+		
+			CalendarAlarmData.push_back(NewAlarmData);
+				
 		}
 			
 		SeekCount++;
@@ -1948,65 +1955,4 @@ void CalendarEventObject::ProcessData(){
 		
 	}
 	
-}
-
-void CalendarEventObject::ProcessAlarms(){
-
-	int SeekCount = 0;
-	
-	bool TZMode = false; // False = STANDARD, True = DAYLIGHT.
-	bool ValidBegin = false;
-	vector<string> EventObjectName;
-	vector<string> EventObjectData;
-	
-	for (vector<string>::iterator iter = ObjectName.begin();
-		iter != ObjectName.end(); iter++){	
-	
-		// Check if the current name is BEGIN and
-		// data is either STANDARD or DAYLIGHT.
-			
-		if (ObjectName[SeekCount] == "BEGIN" &&
-			ObjectData[SeekCount] == "VALARM"){
-			
-			if (ValidBegin == false){
-				ValidBegin = true;
-				EventObjectName.clear();
-				EventObjectData.clear();
-			} else {
-				
-			}
-			
-			SeekCount++;
-			continue;
-			
-		}
-		
-		// Check if current name is END and
-		// data is either STANDARD or DAYLIGHT.
-		
-		if (ObjectName[SeekCount] == "END" &&
-			ObjectData[SeekCount] == "VALARM" && 
-			ValidBegin == true){
-				
-			EventAlarmName.push_back(EventObjectName);
-			EventAlarmData.push_back(EventObjectData);
-			
-			EventObjectName.clear();
-			EventObjectData.clear();
-			
-			ValidBegin = false;
-				
-		}
-		
-		if (ValidBegin == true){
-			
-			EventObjectName.push_back(ObjectName[SeekCount]);
-			EventObjectData.push_back(ObjectData[SeekCount]);
-			
-		}
-		
-		SeekCount++;
-			
-	}
-			
 }
\ No newline at end of file