Changeset 138

Timestamp:

05/23/08 19:42:21 (8 months ago)

Author:

zork

Message:

xml load and store of simple objects with single sublist

Files:

• trunk/dba/dba/ostream.cpp (modified) (2 diffs)
• trunk/dba/dba/ostream.h (modified) (2 diffs)
• trunk/dba/dba/xmlistream.cpp (modified) (4 diffs)
• trunk/dba/dba/xmlistream.h (modified) (3 diffs)
• trunk/dba/dba/xmlostream.cpp (modified) (3 diffs)
• trunk/dba/dba/xmlostream.h (modified) (1 diff)
• trunk/dba/test/testobject.h (modified) (1 diff)
• trunk/dba/test/xmltestcase.cpp (modified) (3 diffs)
• trunk/dba/test/xmltestcase.h (modified) (2 diffs)

trunk/dba/dba/ostream.cpp

@@ -45 +45 @@
-
-bool
-Child
+MemberChildren
-  bool ret = false;
-  bool was_changed = false;
@@ -126 +126 @@
-      const char* obj_table = member->getTableName();
-      //call archive specific store alghoritm
-
+
+
+
-      if (!ret) ret = was_changed;
-      //move forward in loop

trunk/dba/dba/ostream.h

@@ -68 +68 @@
-    virtual ~OStream() {};
-  protected:
+    virtual void initMemberChildrenStore(const Storeable& pObject, const ColMemberEntry& pMember) {};
+    virtual void endMemberChildrenStore(const Storeable& pObject, const ColMemberEntry& pMember) {};
-    /**
-      Default implementation for BIND_COL store that works on data stored in relations and 
@@ -78 +80 @@
-      @return true if at least one subobject object was stored in archive, false otherwise
-    */
-Child
+MemberChildren
-    /**
-      Store all Storeable objects on sublists listed as BIND_COL in store table

trunk/dba/dba/xmlistream.cpp

@@ -11 +11 @@
-//
-#include "xmlistream.h"
+#include "collectionfilter.h"
+#include <iostream>
-
-namespace dba {
@@ -19 +21 @@
-    mParentNode(pNode)
-{
-
-
+
-}
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-};
-
@@ -39 +46 @@
-};
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-  const StoreTable* tbl = Stream::getTable(*pObject);
-  const char* current_table_name = tbl->getTableName();
@@ -71 +182 @@
-  };
-  updateVars();
-
+
+
+
+
+
+
+
+
-  return true;
-};

trunk/dba/dba/xmlistream.h

@@ -22 +22 @@
-Object input stream for XMLArchive
-*/
- 
+
-  public:
-    XMLIStream(xmlNodePtr pNode, const ConvSpec& pSpecs);
@@ -30 +30 @@
-    virtual bool updateVars();
-    virtual bool isCollectionFilterSupported() const { return true; };
+    virtual bool get(Storeable* pObject, const char* pRootTable = NULL) { return IStream::get(pObject, pRootTable); }
+    virtual bool get(CollectionFilterBase* pFilter, const char* pRootTable = NULL);
-    virtual ~XMLIStream();
-  private:
@@ -36 +38 @@
-    
-    virtual void setIdsCondition(const char* pFKeyName, id pRelationId, const std::vector<id>& pIds);
-
+
+
+
+
+
+
-};
-

trunk/dba/dba/xmlostream.cpp

@@ -100 +100 @@
-  };
-  xmlAddChild(mParentNode, node);
+};
+
+void 
+XMLOStream::initMemberChildrenStore(const Storeable& pObject, const ColMemberEntry& pMember) {
-  //set new parent node for storing subobjects
-node
+mParentNode->children
-};
+
+void 
+XMLOStream::endMemberChildrenStore(const Storeable& pObject, const ColMemberEntry& pMember) {
+  //parent node was set to point to valid parent object
+  //in hierarchy. After storing all children we have to reset it back to
+  //parent of pObject node
+  mParentNode = mParentNode->parent;
+  if (mParentNode == NULL)
+    throw DatabaseException("Internal error: parent node is NULL");
+};
+
-
-std::vector<id> 
@@ -117 +132 @@
-
-bool 
-
-
-
-
-
-
-
-
-
-
-
-
+
-  bool was_changed = false;
-  bool ret = false;
-  if (!pObject->isDeleted()) {
+    if (pMember.getFKeyName() != NULL) {
+      xmlAddChild(mParentNode, xmlNewNode(NULL, (xmlChar*)pMember.getFKeyName()));
+      mParentNode = mParentNode->children;
+    };
-    std::auto_ptr<CollectionFilterIterator> iterator(pFilter.createIterator());
-    while(iterator->hasNext()) {
@@ -140 +148 @@
-      };
-      iterator->moveForward();
+    };
+    if (pMember.getFKeyName() != NULL) {
+      mParentNode = mParentNode->parent;
-    };
-  };

trunk/dba/dba/xmlostream.h

@@ -37 +37 @@
-    virtual bool store(Storeable* pObject);
-    virtual bool isCollectionFilterSupported() const { return true; };
-
-
+
-    virtual std::vector<id> loadRefData(const char* pTable, const char* pFkName, id pCollId, id pId);
-    virtual bool deleteRefData(const std::vector<id>& pIds, const char* pTableName);
+    virtual void initMemberChildrenStore(const Storeable& pObject, const ColMemberEntry& pMember);
+    virtual void endMemberChildrenStore(const Storeable& pObject, const ColMemberEntry& pMember);
-  private:
-    xmlNodePtr mParentNode;

trunk/dba/test/testobject.h

@@ -314 +314 @@
-    };
-    bool operator==(const ObjWithList& pObj) const {
-
-
-
+
+
+
+
+
+
+
+
-      for(std::list<TestObject>::const_iterator it = mList.begin(); it != mList.end(); it++) {
-        std::list<TestObject>::const_iterator ot = std::find(pObj.mList.begin(), pObj.mList.end(), *it);

trunk/dba/test/xmltestcase.cpp

@@ -126 +126 @@
-  dba::XMLIStream stream(ar.getIStream());
-  stream.open(obj1);
-
+Next
-};
-
@@ -180 +180 @@
-
-void 
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-"  </obj_with_list>\n"
-"</dba>\n";
@@ -200 +202 @@
-};
-
+void 
+XMLTestCase::sublist_two_store() {
+  const char* result = 
+"<?xml version=\"1.0\" encoding=\"utf-8\"?>\n"
+"<dba>\n"
+"  <obj_with_list name=\"sub\">\n"
+"    <fk_owner>\n"
+"      <test_objects i_value=\"0\" f_value=\"0\" s_value=\"test_object\" d_value=\"2008-01-01Z00:00:00\"/>\n"
+"      <test_objects i_value=\"1\" f_value=\"1\" s_value=\"test_object\" d_value=\"2008-01-02Z00:00:00\"/>\n"
+"    </fk_owner>\n"
+"  </obj_with_list>\n"
+"</dba>\n";
+  {
+    dba::XMLArchive ar;
+    unlink("sublist_two.xml");
+    ar.open("sublist_two.xml");
+    ObjWithList obj1("sub",2);
+    dba::XMLOStream stream(ar.getOStream());
+    stream.open();
+    stream.put(&obj1);
+  }
+  CPPUNIT_ASSERT(compareXML("sublist_two.xml",result));
+};
+
+
+void 
+XMLTestCase::sublist_one_load() {
+  const char* data = 
+"<?xml version=\"1.0\" encoding=\"utf-8\"?>\n"
+"<dba>\n"
+"  <obj_with_list name=\"sub\">\n"
+"    <fk_owner>\n"
+"      <test_objects i_value=\"0\" f_value=\"0\" s_value=\"test_object\" d_value=\"2008-01-01Z00:00:00\"/>\n"
+"    </fk_owner>\n"
+"  </obj_with_list>\n"
+"</dba>\n";
+  { 
+    std::ofstream file("sublist_one_load.xml");
+    file << data;
+  };
+  {
+    dba::XMLArchive ar;
+    ar.open("sublist_one_load.xml");
+    ObjWithList obj1;
+    dba::XMLIStream stream(ar.getIStream());
+
+/*    std::cerr << &(obj1) << std::endl;
+    std::cerr << &(obj1.mList) << std::endl;*/
+    stream.get(&obj1);
+
+    ObjWithList expected("sub",1);
+
+    CPPUNIT_ASSERT(obj1 == expected);
+  };
+};
+
+void 
+XMLTestCase::sublist_two_load() {
+  const char* data = 
+"<?xml version=\"1.0\" encoding=\"utf-8\"?>\n"
+"<dba>\n"
+"  <obj_with_list name=\"sub\">\n"
+"    <fk_owner>\n"
+"      <test_objects i_value=\"0\" f_value=\"0\" s_value=\"test_object\" d_value=\"2008-01-01Z00:00:00\"/>\n"
+"      <test_objects i_value=\"1\" f_value=\"1\" s_value=\"test_object\" d_value=\"2008-01-02Z00:00:00\"/>\n"
+"    </fk_owner>\n"
+"  </obj_with_list>\n"
+"</dba>\n";
+  { 
+    std::ofstream file("sublist_one_load.xml");
+    file << data;
+  };
+  {
+    dba::XMLArchive ar;
+    ar.open("sublist_one_load.xml");
+    ObjWithList obj1;
+    dba::XMLIStream stream(ar.getIStream());
+
+/*    std::cerr << &(obj1) << std::endl;
+    std::cerr << &(obj1.mList) << std::endl;*/
+    stream.get(&obj1);
+
+    ObjWithList expected("sub",2);
+
+    CPPUNIT_ASSERT(obj1 == expected);
+  };
+};
+
-
-} //namespace

trunk/dba/test/xmltestcase.h

@@ -33 +33 @@
-      CPPUNIT_TEST(simpleLoad);
-      CPPUNIT_TEST(varLoad);
-
+
+
+
+
-    CPPUNIT_TEST_SUITE_END();
-  public:
@@ -48 +51 @@
-    void simpleLoad();
-    void varLoad();
-
+
+
+
+
-  private:
-    bool compareXML(const char* pFilename, const char* pData);