X-Git-Url: http://Server1/repobrowser/?a=blobdiff_plain;f=source%2Fobjects%2Fcalendarobject%2FCalendarObject.cpp;h=5a15e1d593c58c1530c75a28e521b2f9a1d1bbde;hb=1d8f15480f6e7e66bf66bcaa9ce58bed9dee8ee7;hp=e094bc2b4c70f628496080ae9c6b3a1efd5796a1;hpb=903ba10af41804e3f0737a39b5a63b28e9de3d69;p=xestiacalendar%2F.git
diff --git a/source/objects/calendarobject/CalendarObject.cpp b/source/objects/calendarobject/CalendarObject.cpp
index e094bc2..5a15e1d 100644
--- a/source/objects/calendarobject/CalendarObject.cpp
+++ b/source/objects/calendarobject/CalendarObject.cpp
@@ -1,3 +1,21 @@
+// CalendarObject.cpp - CalendarObject class functions
+//
+// (c) 2016-2017 Xestia Software Development.
+//
+// This file is part of Xestia Calendar.
+//
+// Xestia Calendar is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by the
+// Free Software Foundation, version 3 of the license.
+//
+// Xestia Calendar is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License along
+// with Xestia Calendar. If not, see
+
#include "CalendarObject.h"
#include "../../common/file.h"
@@ -98,8 +116,8 @@ CalendarObjectLoadResult CalendarObject::LoadString(std::string *LoadStringData)
// the lists.
if (ColonFound == true){
- ObjectName.insert(ObjectName.end(), PropertyName);
- ObjectData.insert(ObjectData.end(), PropertyValue);
+ ObjectName.push_back(PropertyName);
+ ObjectData.push_back(PropertyValue);
}
ColonFound = false;
@@ -157,8 +175,8 @@ CalendarObjectLoadResult CalendarObject::LoadString(std::string *LoadStringData)
PropertyName.size() > 0 &&
PropertyValue.size() > 0){
- ObjectName.insert(ObjectName.end(), PropertyName);
- ObjectData.insert(ObjectData.end(), PropertyValue);
+ ObjectName.push_back(PropertyName);
+ ObjectData.push_back(PropertyValue);
}
@@ -189,9 +207,13 @@ CalendarObjectLoadResult CalendarObject::LoadString(std::string *LoadStringData)
CalendarObjectValidResult CalendarObject::ValidBaseObject(){
bool ValidBegin = false;
+ bool ValidAlarmBegin = false;
bool ValidVersion = false;
bool ValidEnd = false;
int SeekCount = 0;
+ vector DeleteLines;
+ vector AlarmObjectName;
+ vector AlarmObjectData;
// Check that the first line contains BEGIN:VCALENDAR
// and it only appears once.
@@ -216,6 +238,58 @@ CalendarObjectValidResult CalendarObject::ValidBaseObject(){
return CALENDAROBJECTVALID_INVALIDFORMAT;
+ } else if (ObjectName[SeekCount] == "END" &&
+ ObjectData[SeekCount] == "VALARM" &&
+ ValidAlarmBegin == false){
+
+ return CALENDAROBJECTVALID_INVALIDFORMAT;
+
+ } else if (ObjectName[SeekCount] == "END" &&
+ ObjectData[SeekCount] == "VCALENDAR" &&
+ ValidAlarmBegin == true){
+
+ return CALENDAROBJECTVALID_INVALIDFORMAT;
+
+ }
+
+ // Look for any VALARM sections.
+
+ if (ValidAlarmBegin == true){
+
+ AlarmObjectName.push_back(ObjectName[SeekCount]);
+ AlarmObjectData.push_back(ObjectData[SeekCount]);
+ DeleteLines.push_back(SeekCount);
+
+ }
+
+ if (ObjectName[SeekCount] == "END" &&
+ ObjectData[SeekCount] == "VALARM" &&
+ ValidAlarmBegin == true){
+
+ EventAlarmName.push_back(AlarmObjectName);
+ EventAlarmData.push_back(AlarmObjectData);
+
+ AlarmObjectName.clear();
+ AlarmObjectData.clear();
+
+ ValidAlarmBegin = false;
+
+ }
+
+ if (ObjectName[SeekCount] == "BEGIN" &&
+ ObjectData[SeekCount] == "VALARM" &&
+ ValidBegin == true){
+
+ if (ValidAlarmBegin == false){
+ ValidAlarmBegin = true;
+ } else {
+ return CALENDAROBJECTVALID_INVALIDFORMAT;
+ }
+
+ AlarmObjectName.push_back(ObjectName[SeekCount]);
+ AlarmObjectData.push_back(ObjectData[SeekCount]);
+ DeleteLines.push_back(SeekCount);
+
}
SeekCount++;
@@ -268,10 +342,22 @@ CalendarObjectValidResult CalendarObject::ValidBaseObject(){
}
+ // Remove lines that aren't needed as they have
+ // been moved to the EventAlarm section.
+
+ for (vector::reverse_iterator deliter = DeleteLines.rbegin();
+ deliter != DeleteLines.rend(); deliter++){
+
+ ObjectName.erase(ObjectName.begin()+(*deliter));
+ ObjectData.erase(ObjectData.begin()+(*deliter));
+
+ }
+
if (ValidBegin == true &&
ValidEnd == true &&
- ValidVersion == true){
-
+ ValidVersion == true &&
+ ValidAlarmBegin == false){
+
return CALENDAROBJECTVALID_OK;
} else {