X-Git-Url: http://Server1/repobrowser/?a=blobdiff_plain;f=source%2Fobjects%2Fcalendarobject%2FCalendarObject.h;h=449d2b60cf7f3672737877681b01adf0bbb35d22;hb=2ae6c62b369422ff2229e7a1894d03ba05bd02df;hp=20db2c6fe6a2b8c61535e93ae965cf8ab5434ebe;hpb=d4a9fcb732fb54151e52c926d0ac25e85dbe60ee;p=xestiacalendar%2F.git

diff --git a/source/objects/calendarobject/CalendarObject.h b/source/objects/calendarobject/CalendarObject.h
index 20db2c6..449d2b6 100644
--- a/source/objects/calendarobject/CalendarObject.h
+++ b/source/objects/calendarobject/CalendarObject.h
@@ -3,6 +3,10 @@
 #include <fstream>
 #include <sstream>
 #include <vector>
+#include <stdexcept>
+#include <map>
+
+#include "../../common/text.h"
 
 using namespace std;
 
@@ -26,6 +30,7 @@ class CalendarObject{
 	CalendarObjectLoadResult LoadFile(std::string LoadFilename);
 	CalendarObjectLoadResult LoadString(std::string *LoadStringData);
 	CalendarObjectValidResult ValidBaseObject();
+	void ProcessBaseData();
 	
 	// Setup virtual subroutines for use by objects
 	// inheriting from CalendarObject later on.
@@ -33,32 +38,37 @@ class CalendarObject{
 	virtual CalendarObjectValidResult ValidObject() { return CALENDAROBJECTVALID_OK; };
 	virtual void Clear() {};
 	
-	protected:
-	// Initial Loading Data.
-	vector<std::string> ObjectName;
-	vector<std::string> ObjectData;
-	
 	// Object data.
 	
+	std::string MethodData;
+	std::string MethodTokens;
+	
+	std::string CalendarScaleData;
+	std::string CalendarScaleTokens;
+	
+	std::string UniqueID;
+	std::string UniqueIDTokens;
+	
 	vector<std::string> AttachList;
 	vector<std::string> AttachListTokens;
 	vector<std::string> AttachListEncoding;
+	vector<std::string> AttachListFormatType;
 	vector<std::string> AttachListValue;
 	
 	vector<std::string> CategoriesList;
 	vector<std::string> CategoriesListLanguage;
-	vector<std::string> CateogriesListTokens;
+	vector<std::string> CategoriesListTokens;
 	
 	std::string ClassData;
-	std::string ClassListTokens;
+	std::string ClassDataTokens;
 	
 	vector<std::string> CommentList;
-	vector<std::string> CommentListAltID;
+	vector<std::string> CommentListAltRep;
 	vector<std::string> CommentListLanguage;
 	vector<std::string> CommentListTokens;
 	
 	vector<std::string> DescriptionList;
-	vector<std::string> DescriptionListAltID;
+	vector<std::string> DescriptionListAltRep;
 	vector<std::string> DescriptionListLanguage;
 	vector<std::string> DescriptionListTokens;
 	
@@ -66,12 +76,14 @@ class CalendarObject{
 	std::string GeographicTokens;
 	
 	std::string LocationData;
-	std::string LocationDataAltID;
+	std::string LocationDataAltRep;
+	std::string LocationDataLanguage;
+	std::string LocationDataTokens;
 	
 	std::string PercentCompleteData;
 	std::string PercentCompleteTokens;
 	
-	int PriorityData;
+	int PriorityData = -1;
 	std::string PriorityTokens;
 	
 	vector<std::string> ResourcesData;
@@ -83,24 +95,24 @@ class CalendarObject{
 	std::string StatusTokens;
 	
 	std::string SummaryData;
-	std::string SummaryDataAltID;
+	std::string SummaryDataAltRep;
 	std::string SummaryDataLanguage;
 	std::string SummaryDataTokens;
 	
-	std::string DataTimeEndData;
-	std::string DataTimeEndDataValue;
-	std::string DataTimeEndDataTimeZoneID;
-	std::string DataTimeEndDataTokens;
+	std::string DateTimeEndData;
+	std::string DateTimeEndDataValue;
+	std::string DateTimeEndDataTimeZoneID;
+	std::string DateTimeEndDataTokens;
 
 	std::string DueData;
 	std::string DueDataValue;
 	std::string DueDataTimeZoneID;
 	std::string DueDataTokens;
 
-	std::string DataTimeStartData;
-	std::string DataTimeStartDataValue;
-	std::string DataTimeStartDataTimeZoneID;
-	std::string DataTimeStartDataTokens;
+	std::string DateTimeStartData;
+	std::string DateTimeStartDataValue;
+	std::string DateTimeStartDataTimeZoneID;
+	std::string DateTimeStartDataTokens;
 
 	std::string DurationData;
 	std::string DurationDataTokens;
@@ -156,6 +168,7 @@ class CalendarObject{
 	
 	std::string RecurranceIDData;
 	std::string RecurranceIDDataTimeZoneParam;
+	std::string RecurranceIDDataRangeParam;
 	std::string RecurranceIDDataValue;
 	std::string RecurranceIDDataTokens;
 	
@@ -177,16 +190,7 @@ class CalendarObject{
 	vector<std::string> RecurranceDateDataTokens;
 	
 	std::string RecurranceRuleData;
-	std::string RecurranceRuleDataFrequency;
-	std::string RecurranceRuleDataCount;
-	std::string RecurranceRuleDataInterval;
-	std::string RecurranceRuleDataUntil;
-	std::string RecurranceRuleDataMonth;
-	std::string RecurranceRuleDataWeekStarting;
-	std::string RecurranceRuleDataWeekByDay;
-	std::string RecurranceRuleDataWeekByMonthDay;
-	std::string RecurranceRuleDataWeekByWeekNumber;
-	std::string RecurranceRuleDataWeekBySetPosition;
+	std::string RecurranceRuleDataTokens;
 	
 	std::string TriggerDataList;
 	std::string TriggerDataValue;
@@ -202,15 +206,20 @@ class CalendarObject{
 	std::string LastModifiedData;
 	std::string LastModifiedTokens;
 
-	std::string SequenceData;
+	int SequenceData = -1;
 	std::string SequenceTokens;
 
 	vector<std::string> XTokensData;
 	vector<std::string> XTokensDataTokens;
 
-	vector<std::string> RequestStatusData;
-	vector<std::string> RequestStatusLanguage;
-	vector<std::string> RequestStatusTokens;
+	std::string RequestStatusData;
+	std::string RequestStatusLanguage;
+	std::string RequestStatusTokens;
+	
+	protected:
+	// Initial Loading Data.
+	vector<std::string> ObjectName;
+	vector<std::string> ObjectData;
 
 	private:
 	virtual void ProcessData() {};