From: Steve Brokenshire <sbrokenshire@xestia.co.uk>
Date: Sun, 3 Jul 2016 08:42:18 +0000 (+0100)
Subject: Added REV to the SaveString function of ContactDataObject
X-Git-Tag: release-0.14~23
X-Git-Url: http://Server1/repobrowser/?p=xestiaab%2F.git;a=commitdiff_plain;h=214033adf85be05525e096481f05d54aa9622312

Added REV to the SaveString function of ContactDataObject
---

diff --git a/source/contacteditor/cdo/ContactDataObject-Save.cpp b/source/contacteditor/cdo/ContactDataObject-Save.cpp
index 191355f..9e14252 100644
--- a/source/contacteditor/cdo/ContactDataObject-Save.cpp
+++ b/source/contacteditor/cdo/ContactDataObject-Save.cpp
@@ -79,7 +79,54 @@ ContactSaveStatus ContactDataObject::SaveString(wxString *SaveData){
 		
 	}
 	
-	// TODO: Sortout REV.
+	// Process REV.
+	
+	wxDateTime DateTimeSave;
+	DateTimeSave = DateTimeSave.SetToCurrent();
+	wxString DateTimeSaveValue;
+	
+#ifdef XAB_UNITTEST
+	
+	DateTimeSaveValue += "20160703T091000Z";
+	
+#else
+    
+	DateTimeSaveValue += wxString::Format("%04i", DateTimeSave.GetYear());
+	DateTimeSaveValue += wxString::Format("%02i", (DateTimeSave.GetMonth() + 1));
+	DateTimeSaveValue += wxString::Format("%02i", DateTimeSave.GetDay());
+	DateTimeSaveValue += "T";
+	DateTimeSaveValue += wxString::Format("%02i", DateTimeSave.GetHour());
+	DateTimeSaveValue += wxString::Format("%02i", DateTimeSave.GetMinute());
+	DateTimeSaveValue += wxString::Format("%02i", DateTimeSave.GetSecond());
+	DateTimeSaveValue += "Z";
+    
+#endif
+	
+	if (!RevisionTokens.IsEmpty()){
+		
+		ProcessData.Append("REV;");
+		ProcessData.Append(RevisionTokens);
+		ProcessData.Append(":");
+		ProcessData.Append(DateTimeSaveValue);
+		ProcessData.Append("\n");
+		
+		ProcessData = OutputText(&ProcessData);
+		
+		SaveData->Append(ProcessData);
+		ProcessData.clear();		
+		
+	} else {
+	
+		ProcessData.Append("REV:");
+		ProcessData.Append(DateTimeSaveValue);
+		ProcessData.Append("\n");
+		
+		ProcessData = OutputText(&ProcessData);
+		
+		SaveData->Append(ProcessData);
+		ProcessData.clear();
+		
+	}
 	
 	// Process XML.
 
@@ -310,8 +357,12 @@ ContactSaveStatus ContactDataObject::SaveString(wxString *SaveData){
 
 	// TODO: Process IMPP.
 	
+	
+	
 	// TODO: Process TEL.
 	
+	
+	
 	// Process LANG.
 	
 	SaveLanguage(&GeneralLanguageList, &GeneralLanguageListAltID, 
diff --git a/source/tests/xestiaab_contactsave.h b/source/tests/xestiaab_contactsave.h
index bab693e..8afffd6 100644
--- a/source/tests/xestiaab_contactsave.h
+++ b/source/tests/xestiaab_contactsave.h
@@ -30,6 +30,7 @@ TEST(ContactSave, ContactSaveTests){
 	wxString SaveDataCompare = "BEGIN:VCARD\n"
 	"VERSION:4.0\n"
 	"PRODID:-//Xestia//Address Book Unit Testing//KW\n"
+	"REV:20160703T091000Z\n"
 	"FN:Test vCard\n"
 	"TITLE:Knight of the Tests\n"
 	"TITLE:The Tester of Cornwall\n"
@@ -47,6 +48,7 @@ TEST(ContactSave, ContactSaveTests){
 	SaveDataCompare = "BEGIN:VCARD\n"
 	"VERSION:4.0\n"
 	"PRODID:-//Xestia//Address Book Unit Testing//KW\n"
+	"REV:20160703T091000Z\n"
 	"FN:Test vCard\n"
 	"TITLE:The Third Title\n"
 	"TITLE:Knight of the Tests\n"
@@ -62,6 +64,7 @@ TEST(ContactSave, ContactSaveTests){
 	"PRODID:-//Xestia//Address Book Unit Testing//KW\n"
 	"UID:903588-9082374-989120310-AAFECDBCDF\n"
 	"KIND:individual\n"
+	"REV;TEST=YES;DATA=NO;MORE=MAYBE:20160703T091000Z\n"
 	"XML:<a xmlns=\"http://www.w3.org/1999/xhtml\"\\n   href=\"http://example.com/\">Ex\n"
 	" ample Page 1</a>\n"
 	"XML;ALTID=3:<a xmlns=\"http://www.w3.org/1999/xhtml\"\\n   href=\"http://example.\n"