Changeset 141

Timestamp:

05/25/08 19:03:51 (8 months ago)

Author:

zork

Message:

fixed recursion in XMLIStream

Files:

• trunk/dba/dba/collectionfilter.h (modified) (2 diffs)
• trunk/dba/dba/single.h (modified) (1 diff)
• trunk/dba/dba/stddeque.h (modified) (1 diff)
• trunk/dba/dba/stdlist.h (modified) (1 diff)
• trunk/dba/dba/stdmultiset.h (modified) (1 diff)
• trunk/dba/dba/stdset.h (modified) (1 diff)
• trunk/dba/dba/stdvector.h (modified) (1 diff)
• trunk/dba/dba/xmlistream.cpp (modified) (1 diff)
• trunk/dba/test/main.cpp (modified) (1 diff)
• trunk/dba/test/testobject.h (modified) (1 diff)
• trunk/dba/test/xmltestcase.cpp (modified) (1 diff)
• trunk/dba/test/xmltestcase.h (modified) (2 diffs)

trunk/dba/dba/collectionfilter.h

@@ -68 +68 @@
-      Filters for lists implements this by adding reference to 
-      Storeable object returned by create() to contained collection 
+      @return pointer to inserted Storeable object
-      @see InstanceFilter::put implmementation
-    */
-void
+Storeable*
-    /**
-      Remove all objects from collection
@@ -169 +170 @@
-    virtual Storeable& create() { return mInstance; };
-    /**
-      
+
-      @param pToAdd object to add
+      @return pointer to inserted Storeable object
-    */
-void
-void
-
+Storeable*
+Storeable*
+return 
-    };
-    virtual ~InstanceFilter() {}

trunk/dba/dba/single.h

@@ -39 +39 @@
-    virtual Storeable& create() { return *mMember; };
-    //iterator is assiging us
-void put() {};
+Storeable* put() { return mMember; }
-    virtual void clear() {};
-    ~Single() {};

trunk/dba/dba/stddeque.h

@@ -54 +54 @@
-    };
-    virtual void clear() { (CollectionFilter<std::deque<T> >::mMember)->clear(); };
-void
+Storeable*
-      //std::cerr << "adding obj "<< pToAdd.getId() << " to set " << mMember << std::endl;
-      (CollectionFilter<std::deque<T> >::mMember)->push_back(pToAdd);
+      return &((CollectionFilter<std::deque<T> >::mMember)->back());
-    };
-    virtual ~stdDeque() {};

trunk/dba/dba/stdlist.h

@@ -54 +54 @@
-    };
-    virtual void clear() { (CollectionFilter<std::list<T> >::mMember)->clear(); };
-void
+Storeable*
-      //std::cerr << "adding obj "<< pToAdd.getId() << " to list " << mMember << std::endl;
-      (CollectionFilter<std::list<T> >::mMember)->push_back(pToAdd);
+      return &((CollectionFilter<std::list<T> >::mMember)->back());
-    };
-    virtual ~stdList() {};

trunk/dba/dba/stdmultiset.h

@@ -54 +54 @@
-    };
-    virtual void clear() { (CollectionFilter<std::multiset<T> >::mMember)->clear(); };
-void
+Storeable*
-      //std::cerr << "adding obj "<< pToAdd.getId() << " to set " << mSet << std::endl;
-
+
+
-    };
-    virtual ~stdMultiset() {};

trunk/dba/dba/stdset.h

@@ -57 +57 @@
-    };
-    virtual void clear() { (CollectionFilter<std::set<T> >::mMember)->clear(); };
-void
+Storeable*
-      //std::cerr << "adding obj "<< pToAdd.getId() << " to set " << mMember << std::endl;
-
+
+
-    };
-    virtual ~stdSet() {};

trunk/dba/dba/stdvector.h

@@ -54 +54 @@
-    };
-    virtual void clear() { (CollectionFilter<std::vector<T> >::mMember)->clear(); };
-void
+Storeable*
-      //std::cerr << "adding obj "<< pToAdd.getId() << " to set " << mMember << std::endl;
-      (CollectionFilter<std::vector<T> >::mMember)->push_back(pToAdd);
+      return &((CollectionFilter<std::vector<T> >::mMember)->back());
-    };
-    virtual ~stdVector() {};

trunk/dba/dba/xmlistream.cpp

@@ -105 +105 @@
-      CollectionFilterBase* childFilter = member->getFilter();
-      Storeable& child(childFilter->create());
- 
+
-
-      xmlNodePtr node = findNonTextNode(pNode);
-      while (node != NULL) { 
-
-
-
+
-        applyFilters(&child);
+
+        childFilter->updateRef((char*)pParent + member->getMemberOffset());
+        Storeable* ref = childFilter->put();
+        //recursive getChildren can be called only after put()
+        //(on pointer to already added object)
-        if (node->children != NULL)
-
-
-
-
+
-        node = setNextNode(node);
-      };
+
-      //restore level to fkey node
-      if (member->getFKeyName() != NULL)

trunk/dba/test/main.cpp

@@ -150 +150 @@
-  //runner.addTest(new CppUnit::TestCaller<dba_tests::CSVTestCase>("debug_test",&dba_tests::CSVTestCase::manual));
-  //runner.addTest(new CppUnit::TestCaller<SQLite3SQLArchiveTestCase>("debug_test",&SQLite3SQLArchiveTestCase::transactions_rollback));
-//
-runner.addTest(new CppUnit::TestCaller<dba_tests::XMLTestCase>("debug_test",&dba_tests::XMLTestCase::sublist_tree_store
+
+//runner.addTest(new CppUnit::TestCaller<dba_tests::XMLTestCase>("debug_test",&dba_tests::XMLTestCase::sublist_tree_load
-  //runner.addTest(new CppUnit::TestCaller<OdbcPluginTestCase>("debug_test",&OdbcPluginTestCase::dbConnection));
-  //runner.addTest(new CppUnit::TestCaller<PostgresSQLArchiveTestCase>("debug_test",&PostgresSQLArchiveTestCase::sqlError));

trunk/dba/test/testobject.h

@@ -534 +534 @@
-      return true;
-    };
+    void dump(int pLevel = 0) const {
+      std::cerr << "level:" << pLevel << " i_val: " << i << std::endl;
+      for(std::list<TreeObject>::const_iterator it = mLeafs.begin(); it != mLeafs.end(); it++)
+        it->dump(pLevel+1);
+    };
-    std::list<TreeObject> mLeafs;
-};

trunk/dba/test/xmltestcase.cpp

@@ -386 +386 @@
-
-void 
+XMLTestCase::sublist_tree_load() {
+  const char* data = 
+"<?xml version=\"1.0\" encoding=\"utf-8\"?>\n"
+"<dba>\n"
+"  <test_objects i_value=\"1\" f_value=\"1\" s_value=\"1\" d_value=\"2008-01-01Z00:00:00\">\n"
+"    <fk_owner>\n"
+"      <test_objects i_value=\"2\" f_value=\"2\" s_value=\"2\" d_value=\"2008-01-01Z00:00:00\">\n"
+"        <fk_owner>\n"
+"          <test_objects i_value=\"3\" f_value=\"3\" s_value=\"3\" d_value=\"2008-01-01Z00:00:00\"/>\n"
+"        </fk_owner>\n"
+"      </test_objects>\n"
+"    </fk_owner>\n"
+"  </test_objects>\n"
+"</dba>\n";
+  { 
+    std::ofstream file("sublist_tree_load.xml");
+    file << data;
+  };
+  {
+    dba::XMLArchive ar;
+    ar.open("sublist_tree_load.xml");
+
+    dba::XMLIStream stream(ar.getIStream());
+    TreeObject obj1;
+    stream.get(&obj1);
+
+    //obj1.dump();
+
+    TreeObject expected(1,1,"1");
+    TreeObject middle(2,2,"2");
+    TreeObject last(3,3,"3");
+    middle.mLeafs.push_back(last);
+    expected.mLeafs.push_back(middle);
+
+    CPPUNIT_ASSERT(obj1 == expected);
+  };
+};
+
+
+void 
-XMLTestCase::sublist_three_simple() {
-  const char* result = 

trunk/dba/test/xmltestcase.h

@@ -41 +41 @@
-      CPPUNIT_TEST(sublist_tree_store);
-      CPPUNIT_TEST(sublist_three_simple);
+      CPPUNIT_TEST(sublist_tree_load);
-    CPPUNIT_TEST_SUITE_END();
-  public:
@@ -63 +64 @@
-    void sublist_tree_store();
-    void sublist_three_simple();
+    void sublist_tree_load();
-  private:
-    bool compareXML(const char* pFilename, const char* pData);