Added source code, headers and unit testing code for the CALURI vCard Property for...

diff --git a/source/contacteditor/ContactDataObject.cpp b/source/contacteditor/ContactDataObject.cpp
index 7fe4b97..05241d2 100644 (file)
--- a/source/contacteditor/ContactDataObject.cpp
+++ b/source/contacteditor/ContactDataObject.cpp
@@ -100,6 +100,7 @@ ContactLoadStatus ContactDataObject::LoadFile(wxString Filename){
        int PhotoCount = 0;
        int LogoCount = 0;
        int SoundCount = 0;
+       int CalAdrCount = 0;
        wxString ContactLine;
        wxString PropertyLine;
        wxString PropertySeg1;
@@ -353,6 +354,13 @@ ContactLoadStatus ContactDataObject::LoadFile(wxString Filename){
                        ProcessSound(PropertySeg1, PropertySeg2, &SoundCount);
                        SoundCount++;
                        
+               } else if (Property == wxT("CALURI")){
+
+                       // See frmContactEditor-LoadCalendar.cpp
+                       
+                       ProcessCalendarURI(PropertySeg1, PropertySeg2, &CalAdrCount);
+                       CalAdrCount++;
+               
                }
                
        }
@@ -4723,6 +4731,158 @@ void ContactDataObject::ProcessSound(wxString PropertySeg1, wxString PropertySeg
        
 }
 
+void ContactDataObject::ProcessCalendarURI(wxString PropertySeg1, wxString PropertySeg2, int *CalURICount){
+
+       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 = 8;
+       int intPref = 0;                        
+       int intType = 0;
+       
+       SplitValues(&PropertySeg1, &SplitPoints, &SplitLength, intPrevValue);
+       
+       intPrevValue = 7;
+       
+       PropertyType PropType = PROPERTY_NONE;
+       
+       // Look for type before continuing.                     
+
+       CheckType(&PropertySeg1, &SplitPoints, &SplitLength, &intPrevValue, &PropType);
+
+       intPrevValue = 7;
+
+       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")){
+
+                       CalendarListAltID.erase(*CalURICount);
+                       CalendarListAltID.insert(std::make_pair(*CalURICount, PropertyValue));
+               
+               } else if (PropertyName == wxT("PID")){
+
+                       CalendarListPID.erase(*CalURICount);
+                       CalendarListPID.insert(std::make_pair(*CalURICount, 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){
+
+                               CalendarListPref.erase(*CalURICount);
+                               CalendarListPref.insert(std::make_pair(*CalURICount, PriorityNumber));
+
+                       }
+               
+               } else if (PropertyName == wxT("MEDIATYPE")){
+               
+                       CalendarListMediatype.erase(*CalURICount);
+                       CalendarListMediatype.insert(std::make_pair(*CalURICount, 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:
+                       CalendarListType.insert(std::make_pair(*CalURICount, "home"));
+                       break;
+               case PROPERTY_WORK:
+                       CalendarListType.insert(std::make_pair(*CalURICount, "work"));
+                       break;
+       }
+       
+       CalendarList.insert(std::make_pair(*CalURICount, PropertySeg2));
+       
+       if (!PropertyTokens.IsEmpty()){
+       
+               CalendarListTokens.insert(std::make_pair(*CalURICount, 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 df43f97..6f2ad83 100644 (file)
--- a/source/contacteditor/ContactDataObject.h
+++ b/source/contacteditor/ContactDataObject.h
@@ -79,6 +79,7 @@ class ContactDataObject{
        void ProcessPhoto(wxString PropertySeg1, wxString PropertySeg2, int *PhotoCount);
        void ProcessLogo(wxString PropertySeg1, wxString PropertySeg2, int *LogoCount);
        void ProcessSound(wxString PropertySeg1, wxString PropertySeg2, int *SoundCount);
+       void ProcessCalendarURI(wxString PropertySeg1, wxString PropertySeg2, int *CalAdrCount);
 
        public:
 

diff --git a/source/tests/LoadCheck-Load4.vcf b/source/tests/LoadCheck-Load4.vcf
index de15d61..057eeba 100644 (file)
--- a/source/tests/LoadCheck-Load4.vcf
+++ b/source/tests/LoadCheck-Load4.vcf
@@ -486,4 +486,10 @@ SOUND;TYPE=work;ALTID=44;PID=41;MEDIATYPE=application/ogg;LANGUAGE=kw;PREF=4
  n7IXeksuXpi2v2irciAXICHx2PAvM4SVoUKcberP+c9c+Pj7unVvPkyBqbwKmHWBSOj4S4e7W5o
  SH9nHhrW1jnyCtQZClVD86hh6E7vpEDb8Ny+AbwuSlI+b4KyFDt6/fEADBnCOeFgDID42jkBQ+w
  FjNEAGMJtbcK5WgAODg==
+CALURI;ALTID=34;PID=31;PREF=32;MEDIATYPE=text/plain;CALENDARS=FLYING:http://
+ example.com
+CALURI;TYPE=home;ALTID=44;PID=41;MEDIATYPE=text/dryplain;PREF=42;CALENDARS=G
+ ROUNDED:http://example.com/home
+CALURI;TYPE=work;ALTID=54;PID=51;PREF=52;MEDIATYPE=text/stillwetink;CALENDAR
+ S=CANCELLED:http://example.com/business
 END:VCARD

diff --git a/source/tests/xestiaab_contactload.h b/source/tests/xestiaab_contactload.h
index 6894fa4..cbbac4a 100644 (file)
--- a/source/tests/xestiaab_contactload.h
+++ b/source/tests/xestiaab_contactload.h
@@ -3063,6 +3063,11 @@ TEST(ContactLoad, SoundTests){
        ASSERT_NE(TestFile.SoundsListMediatype.end(), TestFileIter);
        ASSERT_EQ("application/ogg", TestFileIter->second);
        
+       // Check the TYPE section.
+       
+       TestFileIter = TestFile.SoundsListType.find(0);
+       ASSERT_EQ(TestFile.SoundsListType.end(), TestFileIter);
+       
        // Check the LANGUAGE section.
        
        TestFileIter = TestFile.SoundsListLanguage.find(0);
@@ -3203,4 +3208,144 @@ TEST(ContactLoad, SoundTests){
 
 }
 
+TEST(ContactLoad, CalendarURITests){
+
+       // Setup the sound files first.
+
+       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 address.
+       
+       TestFileIter = TestFile.CalendarList.find(0);
+       ASSERT_NE(TestFile.CalendarList.end(), TestFileIter);
+       ASSERT_EQ("http://example.com", TestFileIter->second);
+       
+       // Check the TYPE section.
+       
+       TestFileIter = TestFile.CalendarListType.find(0);
+       ASSERT_EQ(TestFile.CalendarListType.end(), TestFileIter);
+       
+       // Check the ALTID section.
+       
+       TestFileIter = TestFile.CalendarListAltID.find(0);
+       ASSERT_NE(TestFile.CalendarListAltID.end(), TestFileIter);
+       ASSERT_EQ("34", TestFileIter->second);
+       
+       // Check the PID section.
+       
+       TestFileIter = TestFile.CalendarListPID.find(0);
+       ASSERT_NE(TestFile.CalendarListPID.end(), TestFileIter);
+       ASSERT_EQ("31", TestFileIter->second);
+       
+       // Check the MEDIATYPE section.
+       
+       TestFileIter = TestFile.CalendarListMediatype.find(0);
+       ASSERT_NE(TestFile.CalendarListMediatype.end(), TestFileIter);
+       ASSERT_EQ("text/plain", TestFileIter->second);
+       
+       // Check the PREF section.
+       
+       TestFileIntIter = TestFile.CalendarListPref.find(0);
+       ASSERT_NE(TestFile.CalendarListPref.end(), TestFileIntIter);
+       ASSERT_EQ(32, TestFileIntIter->second);
+       
+       // Check the extra tokens.
+       
+       TestFileIter = TestFile.CalendarListTokens.find(0);
+       ASSERT_NE(TestFile.CalendarListTokens.end(), TestFileIter);
+       ASSERT_EQ("CALENDARS=FLYING", TestFileIter->second);
+
+       // Start with a home calendar address.
+       
+       TestFileIter = TestFile.CalendarList.find(1);
+       ASSERT_NE(TestFile.CalendarList.end(), TestFileIter);
+       ASSERT_EQ("http://example.com/home", TestFileIter->second);
+       
+       // Check the TYPE section.
+       
+       TestFileIter = TestFile.CalendarListType.find(1);
+       ASSERT_NE(TestFile.CalendarListType.end(), TestFileIter);
+       ASSERT_EQ("home", TestFileIter->second);
+       
+       // Check the ALTID section.
+       
+       TestFileIter = TestFile.CalendarListAltID.find(1);
+       ASSERT_NE(TestFile.CalendarListAltID.end(), TestFileIter);
+       ASSERT_EQ("44", TestFileIter->second);
+       
+       // Check the PID section.
+       
+       TestFileIter = TestFile.CalendarListPID.find(1);
+       ASSERT_NE(TestFile.CalendarListPID.end(), TestFileIter);
+       ASSERT_EQ("41", TestFileIter->second);
+       
+       // Check the MEDIATYPE section.
+       
+       TestFileIter = TestFile.CalendarListMediatype.find(1);
+       ASSERT_NE(TestFile.CalendarListMediatype.end(), TestFileIter);
+       ASSERT_EQ("text/dryplain", TestFileIter->second);
+       
+       // Check the PREF section.
+       
+       TestFileIntIter = TestFile.CalendarListPref.find(1);
+       ASSERT_NE(TestFile.CalendarListPref.end(), TestFileIntIter);
+       ASSERT_EQ(42, TestFileIntIter->second);
+       
+       // Check the extra tokens.
+       
+       TestFileIter = TestFile.CalendarListTokens.find(1);
+       ASSERT_NE(TestFile.CalendarListTokens.end(), TestFileIter);
+       ASSERT_EQ("CALENDARS=GROUNDED", TestFileIter->second);
+
+       // Start with a business calendar address.
+       
+       TestFileIter = TestFile.CalendarList.find(2);
+       ASSERT_NE(TestFile.CalendarList.end(), TestFileIter);
+       ASSERT_EQ("http://example.com/business", TestFileIter->second);
+       
+       // Check the TYPE section.
+       
+       TestFileIter = TestFile.CalendarListType.find(2);
+       ASSERT_NE(TestFile.CalendarListType.end(), TestFileIter);
+       ASSERT_EQ("work", TestFileIter->second);
+       
+       // Check the ALTID section.
+       
+       TestFileIter = TestFile.CalendarListAltID.find(2);
+       ASSERT_NE(TestFile.CalendarListAltID.end(), TestFileIter);
+       ASSERT_EQ("54", TestFileIter->second);
+       
+       // Check the PID section.
+       
+       TestFileIter = TestFile.CalendarListPID.find(2);
+       ASSERT_NE(TestFile.CalendarListPID.end(), TestFileIter);
+       ASSERT_EQ("51", TestFileIter->second);
+       
+       // Check the MEDIATYPE section.
+       
+       TestFileIter = TestFile.CalendarListMediatype.find(2);
+       ASSERT_NE(TestFile.CalendarListMediatype.end(), TestFileIter);
+       ASSERT_EQ("text/stillwetink", TestFileIter->second);
+       
+       // Check the PREF section.
+       
+       TestFileIntIter = TestFile.CalendarListPref.find(2);
+       ASSERT_NE(TestFile.CalendarListPref.end(), TestFileIntIter);
+       ASSERT_EQ(52, TestFileIntIter->second);
+       
+       // Check the extra tokens.
+       
+       TestFileIter = TestFile.CalendarListTokens.find(2);
+       ASSERT_NE(TestFile.CalendarListTokens.end(), TestFileIter);
+       ASSERT_EQ("CALENDARS=CANCELLED", TestFileIter->second);
+
+}
+
 // TODO: Add tests for the Contact Loading process.
\ No newline at end of file