Not Logged In
|
Login
|
Register
Home
|
News
|
Projects
|
Releases
Bugs
|
RFE
|
Repositories
|
Help
projects
/
xestiaab
/
.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Added source, header and unit testing code to check that the file meets the vCard...
[xestiaab/.git]
/
source
/
contacteditor
/
ContactDataObject.cpp
diff --git
a/source/contacteditor/ContactDataObject.cpp
b/source/contacteditor/ContactDataObject.cpp
index
854cb56
..
3d4d319
100644
(file)
--- a/
source/contacteditor/ContactDataObject.cpp
+++ b/
source/contacteditor/ContactDataObject.cpp
@@
-36,7
+36,6
@@
ContactLoadStatus ContactDataObject::LoadFile(wxString Filename){
// Check that the vCard is a valid vCard 4.0 file.
// Check that the vCard is a valid vCard 4.0 file.
-
vCard vCard4FormatCheck;
vCard4FormatCheck.LoadFile(Filename);
vCard vCard4FormatCheck;
vCard4FormatCheck.LoadFile(Filename);
@@
-46,6
+45,16
@@
ContactLoadStatus ContactDataObject::LoadFile(wxString Filename){
return CONTACTLOAD_FILEINVALIDFORMAT;
}
return CONTACTLOAD_FILEINVALIDFORMAT;
}
+
+ // Check that the vCard meets the base specification.
+
+ if (!vCard4FormatCheck.MeetBaseSpecification()){
+
+ return CONTACTLOAD_FILEBASESPECFAIL;
+
+ }
+
+
return CONTACTLOAD_UNITTESTFAIL;
return CONTACTLOAD_UNITTESTFAIL;
Yn Maystri
© 2006 - 2019 Xestia Software Development
Software
Xestia Address Book
Xestia Calendar
Development
Xestia Gelforn
Everything else
About
News
Privacy Policy