X-Git-Url: http://Server1/repobrowser/?a=blobdiff_plain;f=source%2Fobjects%2Fcalendarevent%2FCalendarEvent.cpp;h=f737cc104e0fae217d764e7c22a75a7722bd59a6;hb=33710a568c956e0f09959a8054e7cabf152d744f;hp=720c7bd3fa353cc8289a1fe0c8e56dbbf6dd410c;hpb=9f0d4d57d29e29d63fc3623c567a5d22c4eb86d9;p=xestiacalendar%2F.git diff --git a/source/objects/calendarevent/CalendarEvent.cpp b/source/objects/calendarevent/CalendarEvent.cpp index 720c7bd..f737cc1 100644 --- a/source/objects/calendarevent/CalendarEvent.cpp +++ b/source/objects/calendarevent/CalendarEvent.cpp @@ -100,31 +100,37 @@ CalendarObjectValidResult CalendarEventObject::ValidObject(){ SeekCount = 0; - // Look for DTSTART. + // Look for DTSTART if nothing is set for METHOD.. - for (vector::iterator iter = ObjectName.begin(); - iter != ObjectName.end(); iter++){ + if (MethodData.size() == 0){ + + for (vector::iterator iter = ObjectName.begin(); + iter != ObjectName.end(); iter++){ - try{ - PropertyName = ObjectName[SeekCount].substr(0,7); - } + try{ + PropertyName = ObjectName[SeekCount].substr(0,7); + } - catch(const out_of_range& oor){ - continue; - } + catch(const out_of_range& oor){ + continue; + } - if (PropertyName == "DTSTART"){ + if (PropertyName == "DTSTART"){ - if (ValidDateTimeStart == false){ - ValidDateTimeStart = true; - } else { - return CALENDAROBJECTVALID_INVALIDFORMAT; - } + if (ValidDateTimeStart == false){ + ValidDateTimeStart = true; + } else { + return CALENDAROBJECTVALID_INVALIDFORMAT; + } - } + } - SeekCount++; + SeekCount++; + } + + } else { + ValidDateTimeStart = true; } SeekCount = 0; @@ -197,7 +203,7 @@ void CalendarEventObject::ProcessData(){ DataReceived = ProcessTextVectors(&ObjectName, &ObjectData, false, "UID"); - // Process the data from DTSTAMP. + // Process the data from UID. if (DataReceived.begin() != DataReceived.end()){