Changeset 361

Timestamp:

12/30/06 12:27:46 (16 years ago)

Author:

wagi

Message:

serializing interface extended. write and read except a 'string' as argument

Files:

• trunk/libfreebob/src/bebob/bebob_serialize.cpp (modified) (2 diffs)
• trunk/libfreebob/src/bebob/bebob_serialize.h (modified) (4 diffs)
• trunk/libfreebob/src/bebob/bebob_unittests.cpp (modified) (2 diffs)

trunk/libfreebob/src/bebob/bebob_serialize.cpp

@@ -92 +92 @@
-}
-
+bool
+BeBoB::XMLSerialize::write( const char* pMemberName,
+                            Glib::ustring str)
+{
+    vector<string> tokens;
+    string memberName( pMemberName );
+    tokenize( memberName, tokens, "/" );
+
+    if ( tokens.size() == 0 ) {
+        return false;
+    }
+
+    xmlpp::Node* pNode = m_doc.get_root_node();
+    pNode = getNodePath( pNode, tokens );
+
+    // element to be added
+    xmlpp::Element* pElem = pNode->add_child( tokens[tokens.size() - 1] );
+    pElem->set_child_text( str );
+
+    return true;
+}
-
-xmlpp::Node*
@@ -177 +198 @@
-}
-
+bool
+BeBoB::XMLDeserialize::read( const char* pMemberName,
+                             Glib::ustring& str )
+{
+    xmlpp::Node* pNode = m_parser.get_document()->get_root_node();
+
+    xmlpp::NodeSet nodeSet = pNode->find( pMemberName );
+    for ( xmlpp::NodeSet::iterator it = nodeSet.begin();
+          it != nodeSet.end();
+          ++it )
+    {
+        const xmlpp::Element* pElement = dynamic_cast< const xmlpp::Element* >( *it );
+        if ( pElement && pElement->has_child_text() ) {
+            str = pElement->get_child_text()->get_content();
+            return true;
+        }
+        return false;
+    }
+
+    return false;
+}

trunk/libfreebob/src/bebob/bebob_serialize.h

@@ -34 +34 @@
-        virtual bool write( const char* pMemberName,
-                            long long value ) = 0;
+        virtual bool write( const char* pMemberName,
+                            Glib::ustring str) = 0;
-
-        template <typename T>  bool write( const char* pMemberName, T value );
@@ -45 +47 @@
-        virtual bool read( const char* pMemberName,
-                           long long& value ) = 0;
+        virtual bool read( const char* pMemberName,
+                           Glib::ustring& str ) = 0;
-
-        template <typename T> bool read( const char* pMemberName, T& value );
@@ -56 +60 @@
-        virtual bool write( const char* pMemberName,
-                            long long value );
+        virtual bool write( const char* pMemberName,
+                            Glib::ustring str);
-    private:
-        Glib::ustring    m_filepath;
@@ -70 +76 @@
-        virtual bool read( const char* pMemberName,
-                           long long& value );
+        virtual bool read( const char* pMemberName,
+                           Glib::ustring& str );
-    private:
-        Glib::ustring    m_filepath;

trunk/libfreebob/src/bebob/bebob_unittests.cpp

@@ -319 +319 @@
-}
-
+///////////////////////////////////////
+
+class U3_SerializeMe {
+public:
+    U3_SerializeMe();
+    ~U3_SerializeMe();
+
+    bool operator == ( const U3_SerializeMe& rhs );
+
+    bool serialize( IOSerialize& ser );
+    bool deserialize( IODeserialize& deser );
+
+    const char* m_pString;
+};
+
+U3_SerializeMe::U3_SerializeMe()
+    : m_pString( 0 )
+{
+}
+
+
+U3_SerializeMe::~U3_SerializeMe()
+{
+    delete m_pString;
+}
+//--------------------------
+
+bool
+U3_SerializeMe::operator == ( const U3_SerializeMe& rhs )
+{
+    return strcmp( m_pString, rhs.m_pString ) == 0;
+}
+
+bool
+U3_SerializeMe::serialize( IOSerialize& ser )
+{
+    bool result;
+    result  = ser.write( "m_pString", Glib::ustring( m_pString ) );
+    return result;
+}
+
+bool
+U3_SerializeMe::deserialize( IODeserialize& deser )
+{
+    bool result;
+    Glib::ustring str;
+    result  = deser.read( "m_pString", str );
+
+    m_pString = strdup( str.c_str() );
+
+    return result;
+}
+
+static bool
+testU3()
+{
+    U3_SerializeMe sme1;
+    sme1.m_pString = strdup( "fancy string" );
+
+    {
+        XMLSerialize xmlSerialize( "unittest_u3.xml" );
+        if ( !sme1.serialize( xmlSerialize ) ) {
+            printf( "(serializing failed)" );
+            return false;
+        }
+    }
+
+    U3_SerializeMe sme2;
+
+    {
+        XMLDeserialize xmlDeserialize( "unittest_u3.xml" );
+        if ( !sme2.deserialize( xmlDeserialize ) ) {
+            printf( "(deserializing failed)" );
+            return false;
+        }
+    }
+
+    bool result = sme1 == sme2;
+    if ( !result ) {
+        printf( "(wrong values)" );
+    }
+
+    return result;
+}
+
-/////////////////////////////////////
-/////////////////////////////////////
@@ -334 +419 @@
-    { "serialize 1",  testU1 },
-    { "serialize 2",  testU2 },
+    { "serialize 3",  testU3 },
-};
-