Changeset 174

Timestamp:

07/30/08 16:29:06 (4 months ago)

Author:

zork

Message:

XMLOStream incorrect root node replacement and fatal bug in putChildren processing

Files:

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

trunk/dba/dba/ostream.cpp

@@ -116 +116 @@
-  while(table != NULL) {
-    ColMemberEntry* member = table->getMembers();
+    initMemberChildrenStore(*pObject,*member);
-    while(member != NULL) {
-      //getTableName uses create() to call Storeable::getRootTable()
@@ -126 +127 @@
-      const char* obj_table = member->getTableName();
-      //call archive specific store alghoritm
-      initMemberChildrenStore(*pObject,*member);
-      bool was_changed = putMemberChildren(pObject, *member, filter, obj_table);
-      endMemberChildrenStore(*pObject,*member);
-      if (!ret) ret = was_changed;
-      //move forward in loop
-      member = member->getNextMember();
-    };
+    endMemberChildrenStore(*pObject,*member);
-    //move forward in loop
-    table = table->getNextTable();

trunk/dba/dba/xmlostream.cpp

@@ -149 +149 @@
-  xmlNodePtr node = createNode(current->name);
-  if (!mReplaceParentNode) {
+    debug("Adding child node '%s' to '%s'", getRootTableName(*pObject), (const char*)mParentNode->name);
-    //store table is readed from last element to first
-    //and from child table to parent.
@@ -160 +161 @@
-    node->nsDef = xmlCopyNamespaceList(mParentNode->nsDef);
-    xmlFree(xmlDocSetRootElement(mDocument,node));
+    //no mParentNode means that we are the parent node
+    mParentNode = NULL;
-    mReplaceParentNode = false;
-  };
@@ -177 +180 @@
-XMLOStream::initMemberChildrenStore(const Storeable& pObject, const ColMemberEntry& pMember) {
-  //set new parent node for storing subobjects
-
+
+
+
+
+
+
+
-};
-
@@ -185 +194 @@
-  //in hierarchy. After storing all children we have to reset it back to
-  //parent of pObject node
-
+
+
+
+
-  if (mParentNode == NULL)
-    throw DatabaseException("Internal error: parent node is NULL");
@@ -208 +220 @@
-  bool ret = false;
-  if (!pObject->isDeleted()) {
+/*    if (mParentNode != NULL) {
+      debug("going down to first child of mParent '%s'", (const char*)mParentNode->name);
+      mParentNode = mParentNode->children;
+    } else {
+      mParentNode = xmlDocGetRootElement(mDocument);
+      debug("mParent set to '%s'", (const char*)mParentNode->name);
+    };*/
-    std::auto_ptr<CollectionFilterIterator> iterator(pFilter.createIterator());
-    //do not create fkey node if list is empty
@@ -227 +246 @@
-      };
-    };
+/*    if (mParentNode != xmlDocGetRootElement(mDocument)) {
+      debug("up from mParent '%s'", (const char*)mParentNode->name);
+      mParentNode = mParentNode->parent;
+    };*/
-  };
-  return ret;

trunk/dba/test/main.cpp

@@ -144 +144 @@
-  CppUnit::BriefTestProgressListener listener;
-  runner.eventManager().addListener(&listener);
-
+//
-  //runner.addTest(new CppUnit::TestCaller<SQLite3SQLArchiveTestCase>("debug_test",&SQLite3SQLArchiveTestCase::sqlError));
-  //runner.addTest(new CppUnit::TestCaller<PostgresSQLArchiveTestCase>("debug_test",&PostgresSQLArchiveTestCase::sqlError));
@@ -150 +150 @@
-  //runner.addTest(new CppUnit::TestCaller<dba_tests::CSVTestCase>("debug_test",&dba_tests::CSVTestCase::invalidPos));
-  //runner.addTest(new CppUnit::TestCaller<SQLite3SQLArchiveTestCase>("debug_test",&SQLite3SQLArchiveTestCase::transactions_rollback));
-//
-ublist_two_store
+
+toreBug1
-  //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 @@
-};
-
+struct Address : public dba::Storeable {
+  DECLARE_STORE_TABLE();
+  std::string mData;
+};
+
+BEGIN_STORE_TABLE(Address,dba::Storeable,"address")
+  BIND_STR(mData,dba::String,"data")
+END_STORE_TABLE()
+
+struct Patient : public dba::Storeable {
+  DECLARE_STORE_TABLE();
+  Address mAddress;
+};
+
+BEGIN_STORE_TABLE(Patient,dba::Storeable,"patient")
+  BIND_COL(mAddress,dba::Single,NULL)
+END_STORE_TABLE()
+
+
+struct Report : public dba::Storeable {
+  DECLARE_STORE_TABLE();
+};
+
+BEGIN_STORE_TABLE(Report,dba::Storeable,"report")
+END_STORE_TABLE()
+
+struct Request : public dba::Storeable {
+  DECLARE_STORE_TABLE();
+  Patient mPatient;
+  Report mReport;
+};
+
+BEGIN_STORE_TABLE(Request,dba::Storeable,"request")
+  BIND_COL(mReport,dba::Single,NULL)
+  BIND_COL(mPatient,dba::Single,NULL)
+END_STORE_TABLE()
+
+void
+XMLTestCase::storeBug1() {
+  const char* result = 
+"<?xml version=\"1.0\" encoding=\"utf-8\"?>\n"
+"<request>\n"
+"  <report/>\n"
+"  <patient>\n"
+"    <address/>\n"
+"  </patient>\n"
+"</request>\n"
+;
+  {
+    dba::XMLArchive ar;
+    ar.setRootNodeName(NULL);
+    //ar.useElements();
+    unlink("storebug1.xml");
+    ar.open("storebug1.xml");
+    Request obj1;
+    dba::XMLOStream stream(ar.getOStream());
+    stream.enableDebug();
+    stream.open();
+    stream.put(&obj1);
+  }
+  CPPUNIT_ASSERT(compareXML("storebug1.xml",result));
+};
-
-} //namespace

trunk/dba/test/xmltestcase.h

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