Adds Tasks and Memos and some updates to Messages and Contacs to s11n-boost.h.
Index: src/s11n-boost.h
===================================================================
RCS file: /cvsroot/barry/barry/src/s11n-boost.h,v
retrieving revision 1.5
diff -u -r1.5 s11n-boost.h
--- src/s11n-boost.h 25 May 2007 20:34:05 -0000 1.5
+++ src/s11n-boost.h 26 May 2007 13:40:17 -0000
@@ -72,6 +72,10 @@
ar & make_nvp("MobilePhone", c.MobilePhone);
ar & make_nvp("Pager", c.Pager);
ar & make_nvp("PIN", c.PIN);
+ ar & make_nvp("Radio", c.Radio);
+ ar & make_nvp("WorkPhone2", c.WorkPhone2);
+ ar & make_nvp("HomePhone2", c.HomePhone2);
+ ar & make_nvp("OtherPhone", c.OtherPhone);
ar & make_nvp("FirstName", c.FirstName);
ar & make_nvp("LastName", c.LastName);
ar & make_nvp("Company", c.Company);
@@ -85,8 +89,23 @@
ar & make_nvp("Country", c.Country);
ar & make_nvp("Title", c.Title);
ar & make_nvp("PublicKey", c.PublicKey);
+ ar & make_nvp("URL", c.URL);
+ ar & make_nvp("Prefix", c.Prefix);
+ ar & make_nvp("Category", c.Category);
+ ar & make_nvp("HomeAddress1", c.HomeAddress1);
+ ar & make_nvp("HomeAddress2", c.HomeAddress2);
+ ar & make_nvp("HomeAddress3", c.HomeAddress3);
ar & make_nvp("Notes", c.Notes);
-
+ ar & make_nvp("UserDefined1", c.UserDefined1);
+ ar & make_nvp("UserDefined2", c.UserDefined2);
+ ar & make_nvp("UserDefined3", c.UserDefined3);
+ ar & make_nvp("UserDefined4", c.UserDefined4);
+ ar & make_nvp("HomeCity", c.HomeCity);
+ ar & make_nvp("HomeProvince", c.HomeProvince);
+ ar & make_nvp("HomePostalCode", c.HomePostalCode);
+ ar & make_nvp("HomeCountry", c.HomeCountry);
+ ar & make_nvp("Image", c.Image);
+
if( ver < BARRY_POD_MAP_VERSION ) {
ar & make_nvp("GroupLinks", c.GroupLinks);
ar & make_nvp("Unknowns", c.Unknowns);
@@ -129,6 +148,16 @@
ar & make_nvp("NotificationTime", c.NotificationTime);
ar & make_nvp("StartTime", c.StartTime);
ar & make_nvp("EndTime", c.EndTime);
+
+ ar & make_nvp("FreeBusyFlag", c.FreeBusyFlag);
+ ar & make_nvp("ClassFlag", c.ClassFlag);
+
+ ar & make_nvp("Recurring", c.Recurring);
+ ar & make_nvp("RecurringType", c.RecurringType);
+ ar & make_nvp("Interval", c.Interval);
+ ar & make_nvp("RecurringEndTime", c.RecurringEndTime);
+ ar & make_nvp("Perpetual", c.Perpetual);
+ ar & make_nvp("TimeZoneCode", c.TimeZoneCode);
if( ver < BARRY_POD_MAP_VERSION ) {
ar & make_nvp("Unknowns", c.Unknowns);
@@ -145,6 +174,48 @@
}
}
+template <class ArchiveT>
+void serialize(ArchiveT &ar, Barry::Memo &m, const unsigned int ver)
+{
+ ar & make_nvp("RecordId", m.RecordId);
+
+ ar & make_nvp("Title", m.Title);
+ ar & make_nvp("Body", m.Body);
+ ar & make_nvp("Category", m.Category);
+
+ if( ver < BARRY_POD_MAP_VERSION ) {
+ ar & make_nvp( "Unknowns", m.Unknowns);
+ }
+}
+
+template <class ArchiveT>
+void serialize(ArchiveT &ar, Barry::Task &t, const unsigned int ver)
+{
+ ar & make_nvp("RecordId", t.RecordId);
+
+ ar & make_nvp("Summary", t.Summary);
+ ar & make_nvp("Notes", t.Notes);
+ ar & make_nvp("Categories", t.Categories);
+
+ ar & make_nvp("StartTime", t.StartTime);
+ ar & make_nvp("AlarmTime", t.AlarmTime);
+ ar & make_nvp("DueTime", t.DueTime);
+
+ ar & make_nvp("TimeZoneCode", t.TimeZoneCode);
+ ar & make_nvp("AlarmType", t.AlarmType);
+ ar & make_nvp("Interval", t.Interval);
+ ar & make_nvp("RecurringType", t.RecurringType);
+ ar & make_nvp("RecurringEndTime", t.RecurringEndTime);
+ ar & make_nvp("ClassType", t.ClassType);
+ ar & make_nvp("PriorityFlag", t.PriorityFlag);
+ ar & make_nvp("StatusFlag", t.StatusFlag);
+ ar & make_nvp("Recurring", t.Recurring);
+
+ if( ver < BARRY_POD_MAP_VERSION ) {
+ ar & make_nvp( "Unknowns", t.Unknowns);
+ }
+}
+
}} // namespace boost::serialization
#endif
Index: src/r_memo.h
===================================================================
RCS file: /cvsroot/barry/barry/src/r_memo.h,v
retrieving revision 1.2
diff -u -r1.2 r_memo.h
--- src/r_memo.h 25 May 2007 21:29:00 -0000 1.2
+++ src/r_memo.h 26 May 2007 13:40:17 -0000
@@ -64,7 +64,8 @@
void Clear();
void Dump(std::ostream &os) const;
-
+
+ bool operator<(const Memo &other) const { return Title < other.Title; }
// database name
static const char * GetDBName() { return "Memos"; }
static uint8_t GetDefaultRecType() { return 0; } // or 0?
Index: src/r_task.h
===================================================================
RCS file: /cvsroot/barry/barry/src/r_task.h,v
retrieving revision 1.2
diff -u -r1.2 r_task.h
--- src/r_task.h 25 May 2007 21:29:00 -0000 1.2
+++ src/r_task.h 26 May 2007 13:40:17 -0000
@@ -123,6 +123,7 @@
void Clear();
void Dump(std::ostream &os) const;
+ bool operator<(const Task &other) const { return Summary < other.Summary; }
// database name
static const char * GetDBName() { return "Tasks"; }
Index: tools/btool.cc
===================================================================
RCS file: /cvsroot/barry/barry/tools/btool.cc,v
retrieving revision 1.15
diff -u -r1.15 btool.cc
--- tools/btool.cc 25 May 2007 21:28:29 -0000 1.15
+++ tools/btool.cc 26 May 2007 13:40:17 -0000
@@ -218,7 +218,7 @@
new RecordParser<ServiceBook, Store<ServiceBook> > (
new Store<ServiceBook>(filename, false)));
}
-/*
+
else if( name == "Memos" ) {
return auto_ptr<Parser>(
new RecordParser<Memo, Store<Memo> > (
@@ -229,7 +229,6 @@
new RecordParser<Task, Store<Task> > (
new Store<Task>(filename, false )));
}
-*/
else {
// unknown database, use null parser
return auto_ptr<Parser>( new DataDumpParser );
pgp0CvJN8wqUF.pgp
Description: PGP signature
------------------------------------------------------------------------- This SF.net email is sponsored by DB2 Express Download DB2 Express C - the FREE version of DB2 express and take control of your XML. No limits. Just data. Click to get it now. http://sourceforge.net/powerbar/db2/
_______________________________________________ Barry-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/barry-devel
