Changeset 175

Timestamp:

07/31/08 12:08:33 (4 months ago)

Author:

zork

Message:

XMLOStream forgets where to add class members as elements after store - it always add it to first child

Files:

• trunk/dba/dba/xmlostream.cpp (modified) (3 diffs)
• trunk/dba/dba/xmlostream.h (modified) (1 diff)
• trunk/dba/test/main.cpp (modified) (1 diff)
• trunk/dba/test/xmltestcase.cpp (modified) (3 diffs)
• trunk/dba/test/xmltestcase.h (modified) (2 diffs)

trunk/dba/dba/xmlostream.cpp

@@ -134 +134 @@
-    xmlNodeSetContent(node,encoded_data);
-    xmlFree(encoded_data);
+    debug("adding node '%s' to '%s'", pName, (const char*)pNode->name);
-    xmlAddChild(pNode,node);
-  } else {
@@ -155 +156 @@
-    xmlNodePtr last = xmlGetLastChild(mParentNode);
-    if (last == NULL)
-
+mLastAddedNode = 
-    else
-
- 
+mLastAddedNode = 
+
-    node->nsDef = xmlCopyNamespaceList(mParentNode->nsDef);
-    xmlFree(xmlDocSetRootElement(mDocument,node));
@@ -181 +182 @@
-  //set new parent node for storing subobjects
-  if (mParentNode != NULL) {
-first child of mParent '%s'"
-ParentNode->children
+last added child '%s' of mParent '%s'", (const char*)mLastAddedNode->name
+LastAddedNode
-  } else {
-    mParentNode = xmlDocGetRootElement(mDocument);

trunk/dba/dba/xmlostream.h

@@ -45 +45 @@
-    xmlDocPtr mDocument;
-    xmlNodePtr mParentNode;
+    xmlNodePtr mLastAddedNode;
-    bool mReplaceParentNode;
-    bool mUseElements;

trunk/dba/test/main.cpp

@@ -151 +151 @@
-  //runner.addTest(new CppUnit::TestCaller<SQLite3SQLArchiveTestCase>("debug_test",&SQLite3SQLArchiveTestCase::transactions_rollback));
-  runner.addTest(dba_tests::XMLTestCase::suite());
-1
+2
-  //runner.addTest(new CppUnit::TestCaller<dba_tests::XMLTestCase>("debug_test",&dba_tests::XMLTestCase::store_two));
-  //runner.addTest(new CppUnit::TestCaller<OdbcPluginTestCase>("debug_test",&OdbcPluginTestCase::dbConnection));

trunk/dba/test/xmltestcase.cpp

@@ -832 +832 @@
-};
-
-
+storeBug1
-  DECLARE_STORE_TABLE();
-  std::string mData;
-};
-
-
+storeBug1
-  BIND_STR(mData,dba::String,"data")
-END_STORE_TABLE()
-
-
+storeBug1
-  DECLARE_STORE_TABLE();
-
-
-
-
+storeBug1
+
+
+storeBug1
-  BIND_COL(mAddress,dba::Single,NULL)
-END_STORE_TABLE()
-
-
-
+storeBug1
-  DECLARE_STORE_TABLE();
-};
-
-
+storeBug1
-END_STORE_TABLE()
-
-
+storeBug1
-  DECLARE_STORE_TABLE();
-
-
-
-
-
+storeBug1
+storeBug1
+
+
+storeBug1
-  BIND_COL(mReport,dba::Single,NULL)
-  BIND_COL(mPatient,dba::Single,NULL)
@@ -886 +886 @@
-    unlink("storebug1.xml");
-    ar.open("storebug1.xml");
-
+storeBug1
-    dba::XMLOStream stream(ar.getOStream());
-    stream.enableDebug();
@@ -895 +895 @@
-};
-
+struct storeBug2Address : public dba::Storeable {
+  storeBug2Address(const std::string& pData) : mData(pData) {};
+  std::string mData;
+  DECLARE_STORE_TABLE();
+};
+
+BEGIN_STORE_TABLE(storeBug2Address,dba::Storeable,"address")
+  BIND_STR(mData,dba::String,"addressdata")
+END_STORE_TABLE()
+
+struct storeBug2Patient : public dba::Storeable {
+  storeBug2Patient() : mAddress("patient address") {};
+  storeBug2Address mAddress;
+  DECLARE_STORE_TABLE();
+};
+
+BEGIN_STORE_TABLE(storeBug2Patient,dba::Storeable,"patient")
+  BIND_COL(mAddress,dba::Single,NULL)
+END_STORE_TABLE()
+
+struct storeBug2Request : public dba::Storeable {
+  storeBug2Request() : mData("request data"), mAddress("request address") {};
+  storeBug2Patient mPatient;
+  storeBug2Address mAddress;
+  std::string mData;
+  DECLARE_STORE_TABLE();
+};
+
+BEGIN_STORE_TABLE(storeBug2Request,dba::Storeable,"request")
+  BIND_STB(mAddress)
+  BIND_COL(mPatient,dba::Single,NULL)
+  BIND_STR(mData,dba::String,"requestdata")
+END_STORE_TABLE()
+
+void
+XMLTestCase::storeBug2() {
+  const char* result = 
+"<?xml version=\"1.0\" encoding=\"utf-8\"?>\n"
+"<request>\n"
+"  <addressdata>request address</addressdata>\n"
+"  <patient>\n"
+"    <address>\n"
+"      <addressdata>patient address</addressdata>\n"
+"    </address>\n"
+"  </patient>\n"
+"  <requestdata>request data</requestdata>\n"
+"</request>\n"
+;
+  {
+    dba::XMLArchive ar;
+    ar.setRootNodeName(NULL);
+    ar.useElements();
+    unlink("storebug2.xml");
+    ar.open("storebug2.xml");
+    storeBug2Request obj1;
+    dba::XMLOStream stream(ar.getOStream());
+    stream.enableDebug();
+    stream.open();
+    stream.put(&obj1);
+  }
+  CPPUNIT_ASSERT(compareXML("storebug2.xml",result));
+};
+
-} //namespace
-

trunk/dba/test/xmltestcase.h

@@ -53 +53 @@
-      CPPUNIT_TEST(loadFromElements);
-      CPPUNIT_TEST(storeToElements);
-1
+2
-    CPPUNIT_TEST_SUITE_END();
-  public:
@@ -91 +91 @@
-    void storeToElements();
-    void storeBug1();
+    void storeBug2();
-  private:
-    bool compareXML(const char* pFilename, const char* pData);