Branch 'ayres' - 2 commits - c++/lib schemas/kolabformat.xsd

[Camila Ayres]

 c++/lib/kolabcontainers.cpp |   30 +++++++++++++++++++++++++++++-
 schemas/kolabformat.xsd     |   16 ++++++++++++++++
 2 files changed, 45 insertions(+), 1 deletion(-)

New commits:
commit 03bb18cb3995e5df5641c6c957afad50e38fec96
Author: Camila San <smayres at gmail.com>
Date:   Tue Mar 6 00:23:21 2012 +0100

    add configuration on kolabformat.xsd.

diff --git a/schemas/kolabformat.xsd b/schemas/kolabformat.xsd
index 006471b..655a7e3 100644
--- a/schemas/kolabformat.xsd
+++ b/schemas/kolabformat.xsd
@@ -80,6 +80,22 @@
             </xs:extension>
         </xs:complexContent>
 </xs:complexType>
+
+<xs:element name="configuration" type="configuration"/>
+    <xs:complexType name="configuration">
+        <xs:complexContent mixed="false">
+            <xs:extension base="KolabBase">
+                <xs:sequence>
+                    <xs:element name="uid" type="xs:string"/>
+		    <xs:element name="version" type="xs:string"/>
+		    <xs:element name="prodid" type="xs:string"/>
+		    <xs:element name="creationdate" type="datetimePropertyType"/>
+		    <xs:element name="lastModification" type="datetimePropertyType"/>
+		    <xs:element name="type" type="xs:string"/>		    
+                </xs:sequence>
+            </xs:extension>
+        </xs:complexContent>
+</xs:complexType>
     
 
     


commit e72b138ab1ff1637c7368d7dc36dead00ee69e04
Author: Camila San <smayres at gmail.com>
Date:   Tue Mar 6 00:15:53 2012 +0100

    Including configuration (crashing yet).

diff --git a/c++/lib/kolabcontainers.cpp b/c++/lib/kolabcontainers.cpp
index 7dc0908..6c2afc7 100644
--- a/c++/lib/kolabcontainers.cpp
+++ b/c++/lib/kolabcontainers.cpp
@@ -823,11 +823,39 @@ void Note::setXCustom(const std::string& x)
 	n->xcustom = x;
 }
 
+struct Configuration::Private
+{
+	std::string uid;
+	std::string prodid;	
+	DateTime creationDate;	
+	DateTime lastModification;
+	std::string type;
+	std::string configurationType;
+	
+};
+
 Configuration::Configuration(): conf(new Configuration::Private)
 {
 
 }
 
+void Configuration::operator=(const Configuration& )
+{
+
+}
+
+
+bool Configuration::operator==(const Configuration& other) const
+{
+    return (conf->uid == other.uid() &&
+       conf->prodid == other.prodid &&
+	conf->creationDate == other.creationDate() &&
+	conf->lastModification == other.lastModification() &&
+	conf->type == other.type &&
+	conf->configurationType == other.configurationType());
+}
+
+
 Configuration::Configuration ( const Configuration& )
 {
 
@@ -839,7 +867,7 @@ void Configuration::setLastModification ( const DateTime& d)
 
 }
 
-void Configuration::setConfigurationType ( const std::string& s)
+void Configuration::setConfigurationType (const std::string& s)
 {
 
 }