Added source code, headers and unit tests to the FBURL vCard Property for ContactData...

diff --git a/source/contacteditor/ContactDataObject.cpp b/source/contacteditor/ContactDataObject.cpp
index d14043c..8bddc03 100644 (file)
--- a/source/contacteditor/ContactDataObject.cpp
+++ b/source/contacteditor/ContactDataObject.cpp
@@ -102,6 +102,7 @@ ContactLoadStatus ContactDataObject::LoadFile(wxString Filename){
        int SoundCount = 0;
        int CalendarCount = 0;
        int CalendarAddressCount = 0;
+       int FreeBusyAddressCount = 0;
        wxString ContactLine;
        wxString PropertyLine;
        wxString PropertySeg1;
@@ -367,6 +368,13 @@ ContactLoadStatus ContactDataObject::LoadFile(wxString Filename){
                        ProcessCalendarAddressURI(PropertySeg1, PropertySeg2, &CalendarAddressCount);
                        CalendarAddressCount++;
                
+               } else if (Property == wxT("FBURL")){
+
+                       // See frmContactEditor-LoadCalendar.cpp
+
+                       ProcessCalendarFreeBusy(PropertySeg1, PropertySeg2, &FreeBusyAddressCount);
+                       FreeBusyAddressCount++;
+
                }
                
        }
@@ -5041,6 +5049,158 @@ void ContactDataObject::ProcessCalendarAddressURI(wxString PropertySeg1, wxStrin
        
 }
 
+void ContactDataObject::ProcessCalendarFreeBusy(wxString PropertySeg1, wxString PropertySeg2, int *FreeBusyAddressCount){
+
+       size_t intPropertyLen = PropertySeg1.Len();
+       std::map<int, int> SplitPoints;
+       std::map<int, int> SplitLength;
+       std::map<int, int>::iterator SLiter;                    
+       wxString PropertyData;
+       wxString PropertyName;
+       wxString PropertyValue;
+       wxString PropertyTokens;
+       bool FirstToken = TRUE;
+       int intSplitsFound = 0;
+       int intSplitSize = 0;
+       int intPrevValue = 7;
+       int intPref = 0;                        
+       int intType = 0;
+       
+       SplitValues(&PropertySeg1, &SplitPoints, &SplitLength, intPrevValue);
+       
+       intPrevValue = 6;
+       
+       PropertyType PropType = PROPERTY_NONE;
+       
+       // Look for type before continuing.                     
+
+       CheckType(&PropertySeg1, &SplitPoints, &SplitLength, &intPrevValue, &PropType);
+
+       intPrevValue = 6;
+
+       for (std::map<int, int>::iterator intiter = SplitPoints.begin(); 
+       intiter != SplitPoints.end(); ++intiter){
+       
+               SLiter = SplitLength.find(intiter->first);
+       
+               PropertyData = PropertySeg1.Mid(intPrevValue, (SLiter->second));
+               
+               wxStringTokenizer PropertyElement (PropertyData, wxT("="));
+               PropertyName = PropertyElement.GetNextToken();                          
+               PropertyValue = PropertyElement.GetNextToken();
+               
+               intPrevValue = intiter->second;
+               
+               // Process properties.
+               
+               size_t intPropertyValueLen = PropertyValue.Len();
+               
+               if (PropertyValue.Mid((intPropertyValueLen - 1), 1) == wxT("\"")){
+                       
+                       PropertyValue.Trim();
+                       PropertyValue.RemoveLast();
+                       
+               }                               
+               
+               if (PropertyValue.Mid(0, 1) == wxT("\"")){
+                       
+                       PropertyValue.Remove(0, 1);
+                       
+               }                       
+               
+               CaptureString(&PropertyValue, FALSE);
+               
+               if (PropertyName == wxT("ALTID")){
+
+                       FreeBusyListAltID.erase(*FreeBusyAddressCount);
+                       FreeBusyListAltID.insert(std::make_pair(*FreeBusyAddressCount, PropertyValue));
+               
+               } else if (PropertyName == wxT("PID")){
+
+                       FreeBusyListPID.erase(*FreeBusyAddressCount);
+                       FreeBusyListPID.insert(std::make_pair(*FreeBusyAddressCount, PropertyValue));
+               
+               } else if (PropertyName == wxT("PREF")){
+                       
+                       int PriorityNumber = 0;
+                       bool ValidNumber = TRUE;
+                       
+                       try{
+                               PriorityNumber = std::stoi(PropertyValue.ToStdString());
+                       }
+                       
+                       catch(std::invalid_argument &e){
+                               ValidNumber = FALSE;
+                       }
+
+                       if (ValidNumber == TRUE){
+
+                               FreeBusyListPref.erase(*FreeBusyAddressCount);
+                               FreeBusyListPref.insert(std::make_pair(*FreeBusyAddressCount, PriorityNumber));
+
+                       }
+               
+               } else if (PropertyName == wxT("MEDIATYPE")){
+               
+                       FreeBusyListMediatype.erase(*FreeBusyAddressCount);
+                       FreeBusyListMediatype.insert(std::make_pair(*FreeBusyAddressCount, PropertyValue));
+
+               } else {
+               
+                       // Something else we don't know about so append
+                       // to the tokens variable.
+                       
+                       if (!PropertyName.IsEmpty() && !PropertyValue.IsEmpty() && PropertyName != wxT("TYPE")){
+                       
+                               if (FirstToken == TRUE){
+                               
+                                       PropertyTokens.Append(PropertyName + wxT("=") + PropertyValue);
+                                       FirstToken = FALSE;
+                               
+                               } else {
+                               
+                                       PropertyTokens.Append(wxT(";") + PropertyName + wxT("=") + PropertyValue);
+                               
+                               }
+                       
+                       }
+               
+               }
+       
+       }       
+       
+       intPropertyLen = PropertySeg2.Len();
+       SplitPoints.clear();
+       SplitLength.clear();
+       intSplitsFound = 0;
+       intSplitSize = 0;
+       intPrevValue = 0;
+       
+       CaptureString(&PropertySeg2, FALSE);
+       
+       // Add the data to the General/Home/Work address variables.
+               
+       switch(PropType){
+               case PROPERTY_NONE:
+                       break;
+               case PROPERTY_HOME:
+                       FreeBusyListType.insert(std::make_pair(*FreeBusyAddressCount, "home"));
+                       break;
+               case PROPERTY_WORK:
+                       FreeBusyListType.insert(std::make_pair(*FreeBusyAddressCount, "work"));
+                       break;
+       }
+       
+       FreeBusyList.insert(std::make_pair(*FreeBusyAddressCount, PropertySeg2));
+       
+       if (!PropertyTokens.IsEmpty()){
+       
+               FreeBusyListTokens.insert(std::make_pair(*FreeBusyAddressCount, PropertyTokens));
+       
+       }
+
+}
+
 void SplitValues(wxString *PropertyLine, 
        std::map<int,int> *SplitPoints, 
        std::map<int,int> *SplitLength, 

diff --git a/source/contacteditor/ContactDataObject.h b/source/contacteditor/ContactDataObject.h
index 79c1a70..ccdc5db 100644 (file)
--- a/source/contacteditor/ContactDataObject.h
+++ b/source/contacteditor/ContactDataObject.h
@@ -81,6 +81,7 @@ class ContactDataObject{
        void ProcessSound(wxString PropertySeg1, wxString PropertySeg2, int *SoundCount);
        void ProcessCalendarURI(wxString PropertySeg1, wxString PropertySeg2, int *CalAdrCount);
        void ProcessCalendarAddressURI(wxString PropertySeg1, wxString PropertySeg2, int *CalAdrURICount);
+       void ProcessCalendarFreeBusy(wxString PropertySeg1, wxString PropertySeg2, int *FreeBusyAddressCount);
 
        public:
 

diff --git a/source/tests/LoadCheck-Load4.vcf b/source/tests/LoadCheck-Load4.vcf
index b4e5fb4..180475f 100644 (file)
--- a/source/tests/LoadCheck-Load4.vcf
+++ b/source/tests/LoadCheck-Load4.vcf
@@ -498,4 +498,10 @@ CALADRURI;TYPE=home;ALTID=24;PID=21;PREF=22;MEDIATYPE=text/dryplain;REQUEST=
  MAYBE:http://example.com/home/request
 CALADRURI;TYPE=work;ALTID=34;PID=31;PREF=32;MEDIATYPE=text/stillwetink;REQUE
  ST=NO:http://example.com/business/request
+FBURL;ALTID=74;PID=71;PREF=72;MEDIATYPE=text/plain;STATUS=OUT:http://example
+ .com/freebusy
+FBURL;TYPE=home;ALTID=84;PID=81;PREF=82;MEDIATYPE=text/dryplain;STATUS=FREE:
+ http://example.com/home/freebusy
+FBURL;TYPE=work;ALTID=94;PID=91;PREF=92;MEDIATYPE=text/stillwetink;STATUS=BU
+ SY:http://example.com/business/freebusy
 END:VCARD

diff --git a/source/tests/xestiaab_contactload.h b/source/tests/xestiaab_contactload.h
index aca50e4..803d2a3 100644 (file)
--- a/source/tests/xestiaab_contactload.h
+++ b/source/tests/xestiaab_contactload.h
@@ -3482,6 +3482,144 @@ TEST(ContactLoad, CalendarAddressURITests){
        ASSERT_NE(TestFile.CalendarRequestListTokens.end(), TestFileIter);
        ASSERT_EQ("REQUEST=NO", TestFileIter->second);
        
+}
+
+TEST(ContactLoad, FreeBusyTests){
+
+       ContactDataObject TestFile;
+
+       // Check that the vCard 4.0 file loads OK.
+
+       ASSERT_EQ(CONTACTLOAD_OK, TestFile.LoadFile("LoadCheck-Load4.vcf"));
+
+       std::map<int,wxString>::iterator TestFileIter;
+       std::map<int,int>::iterator TestFileIntIter;
+
+       // Start with a general calendar request address.
+       
+       TestFileIter = TestFile.FreeBusyList.find(0);
+       ASSERT_NE(TestFile.FreeBusyList.end(), TestFileIter);
+       ASSERT_EQ("http://example.com/freebusy", TestFileIter->second);
+       
+       // Check the TYPE section.
+       
+       TestFileIter = TestFile.FreeBusyListType.find(0);
+       ASSERT_EQ(TestFile.FreeBusyListType.end(), TestFileIter);
+       
+       // Check the ALTID section.
+       
+       TestFileIter = TestFile.FreeBusyListAltID.find(0);
+       ASSERT_NE(TestFile.FreeBusyListAltID.end(), TestFileIter);
+       ASSERT_EQ("74", TestFileIter->second);
+       
+       // Check the PID section.
+       
+       TestFileIter = TestFile.FreeBusyListPID.find(0);
+       ASSERT_NE(TestFile.FreeBusyListPID.end(), TestFileIter);
+       ASSERT_EQ("71", TestFileIter->second);
+       
+       // Check the MEDIATYPE section.
+       
+       TestFileIter = TestFile.FreeBusyListMediatype.find(0);
+       ASSERT_NE(TestFile.FreeBusyListMediatype.end(), TestFileIter);
+       ASSERT_EQ("text/plain", TestFileIter->second);
+       
+       // Check the PREF section.
+       
+       TestFileIntIter = TestFile.FreeBusyListPref.find(0);
+       ASSERT_NE(TestFile.FreeBusyListPref.end(), TestFileIntIter);
+       ASSERT_EQ(72, TestFileIntIter->second);
+       
+       // Check the extra tokens.
+       
+       TestFileIter = TestFile.FreeBusyListTokens.find(0);
+       ASSERT_NE(TestFile.FreeBusyListTokens.end(), TestFileIter);
+       ASSERT_EQ("STATUS=OUT", TestFileIter->second);
+
+       // Start with a home calendar request address.
+       
+       TestFileIter = TestFile.FreeBusyList.find(1);
+       ASSERT_NE(TestFile.FreeBusyList.end(), TestFileIter);
+       ASSERT_EQ("http://example.com/home/freebusy", TestFileIter->second);
+       
+       // Check the TYPE section.
+       
+       TestFileIter = TestFile.FreeBusyListType.find(1);
+       ASSERT_NE(TestFile.FreeBusyListType.end(), TestFileIter);
+       ASSERT_EQ("home", TestFileIter->second);
+       
+       // Check the ALTID section.
+       
+       TestFileIter = TestFile.FreeBusyListAltID.find(1);
+       ASSERT_NE(TestFile.FreeBusyListAltID.end(), TestFileIter);
+       ASSERT_EQ("84", TestFileIter->second);
+       
+       // Check the PID section.
+       
+       TestFileIter = TestFile.FreeBusyListPID.find(1);
+       ASSERT_NE(TestFile.FreeBusyListPID.end(), TestFileIter);
+       ASSERT_EQ("81", TestFileIter->second);
+       
+       // Check the MEDIATYPE section.
+       
+       TestFileIter = TestFile.FreeBusyListMediatype.find(1);
+       ASSERT_NE(TestFile.FreeBusyListMediatype.end(), TestFileIter);
+       ASSERT_EQ("text/dryplain", TestFileIter->second);
+       
+       // Check the PREF section.
+       
+       TestFileIntIter = TestFile.FreeBusyListPref.find(1);
+       ASSERT_NE(TestFile.FreeBusyListPref.end(), TestFileIntIter);
+       ASSERT_EQ(82, TestFileIntIter->second);
+       
+       // Check the extra tokens.
+       
+       TestFileIter = TestFile.FreeBusyListTokens.find(1);
+       ASSERT_NE(TestFile.FreeBusyListTokens.end(), TestFileIter);
+       ASSERT_EQ("STATUS=FREE", TestFileIter->second);
+
+       // Start with a business calendar request address.
+       
+       TestFileIter = TestFile.FreeBusyList.find(2);
+       ASSERT_NE(TestFile.FreeBusyList.end(), TestFileIter);
+       ASSERT_EQ("http://example.com/business/freebusy", TestFileIter->second);
+       
+       // Check the TYPE section.
+       
+       TestFileIter = TestFile.FreeBusyListType.find(2);
+       ASSERT_NE(TestFile.FreeBusyListType.end(), TestFileIter);
+       ASSERT_EQ("work", TestFileIter->second);
+       
+       // Check the ALTID section.
+       
+       TestFileIter = TestFile.FreeBusyListAltID.find(2);
+       ASSERT_NE(TestFile.FreeBusyListAltID.end(), TestFileIter);
+       ASSERT_EQ("94", TestFileIter->second);
+       
+       // Check the PID section.
+       
+       TestFileIter = TestFile.FreeBusyListPID.find(2);
+       ASSERT_NE(TestFile.FreeBusyListPID.end(), TestFileIter);
+       ASSERT_EQ("91", TestFileIter->second);
+       
+       // Check the MEDIATYPE section.
+       
+       TestFileIter = TestFile.FreeBusyListMediatype.find(2);
+       ASSERT_NE(TestFile.FreeBusyListMediatype.end(), TestFileIter);
+       ASSERT_EQ("text/stillwetink", TestFileIter->second);
+       
+       // Check the PREF section.
+       
+       TestFileIntIter = TestFile.FreeBusyListPref.find(2);
+       ASSERT_NE(TestFile.FreeBusyListPref.end(), TestFileIntIter);
+       ASSERT_EQ(92, TestFileIntIter->second);
+       
+       // Check the extra tokens.
+       
+       TestFileIter = TestFile.FreeBusyListTokens.find(2);
+       ASSERT_NE(TestFile.FreeBusyListTokens.end(), TestFileIter);
+       ASSERT_EQ("STATUS=BUSY", TestFileIter->second);
+
 
 }