Changeset 153

Timestamp:

07/01/08 16:34:50 (6 months ago)

Author:

zork

Message:

allow to map object to root xml node

Files:

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

trunk/dba/dba/xmlarchive.cpp

@@ -51 +51 @@
-    if (root->name == NULL)
-      throw DataException("Root node has no name");
-xmlStrcmp(mRootNodeName,root->name
-, forgot to call setRootNodeName?
+(mRootNodeName != NULL) && (xmlStrcmp(mRootNodeName,root->name)
+
-  } else {
-    mDocument = xmlNewDoc((const xmlChar*)"1.0");
-
-
+
+
+
+
-  };
-  updateEncoding();
-
+
+
+
+
+
-};
-
@@ -73 +79 @@
-IStream* 
-XMLArchive::getInputStream() {
-
+
+
+
+
-};
-
-OStream* 
-XMLArchive::getOutputStream() {
-
+Document,m
-};
-
-XMLIStream 
-XMLArchive::getIStream() {
-
-
+
+
+
+
-};
-
-XMLOStream 
-XMLArchive::getOStream() {
-
+Document,m
-  return ret;
-};

trunk/dba/dba/xmlistream.cpp

@@ -21 +21 @@
-    mParentNode(pNode)
-{
-->children
+
-}
-

trunk/dba/dba/xmlostream.cpp

@@ -16 +16 @@
-namespace dba {
-
-
+DocPtr pDocument, xml
-  : OStream(),
-    ConvSpecContainer(pSpecs),
+    mDocument(pDocument),
-    mParentNode(pNode)
-{
-  mCurrentNode = mParentNode->children;
-}
-
@@ -99 +99 @@
-      break;
-  };
-
+
+
+
+
-  return true;
-};

trunk/dba/dba/xmlostream.h

@@ -24 +24 @@
-class XMLOStream  : public OStream, public XMLErrorHandler, public ConvSpecContainer {
-  public:
-
+DocPtr pDocument, xml
-    virtual void close();
-    virtual void destroy();
@@ -43 +43 @@
-    virtual void endMemberChildrenStore(const Storeable& pObject, const ColMemberEntry& pMember);
-  private:
+    xmlDocPtr mDocument;
-    xmlNodePtr mParentNode;
-    xmlNodePtr mCurrentNode;
-    
-    void updateNodeFromVars(xmlNodePtr pNode, mt_class* pTable);

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::manual));
-  //runner.addTest(new CppUnit::TestCaller<SQLite3SQLArchiveTestCase>("debug_test",&SQLite3SQLArchiveTestCase::transactions_rollback));
-//
-ublist_tree_l
+
+impleOneL
-  //runner.addTest(new CppUnit::TestCaller<OdbcPluginTestCase>("debug_test",&OdbcPluginTestCase::dbConnection));
-  //runner.addTest(new CppUnit::TestCaller<PostgresSQLArchiveTestCase>("debug_test",&PostgresSQLArchiveTestCase::sqlError));

trunk/dba/test/xmltestcase.cpp

@@ -100 +100 @@
-
-void
+XMLTestCase::simpleOneStore() {
+  const char* result = 
+"<?xml version=\"1.0\" encoding=\"utf-8\"?>\n"
+"<test_objects i_value=\"1\" f_value=\"1.1\" s_value=\"test\" d_value=\"2008-01-01Z00:00:00\"/>\n"
+;
+  {
+    dba::XMLArchive ar;
+    ar.setRootNodeName(NULL);
+    unlink("simpleonestore.xml");
+    ar.open("simpleonestore.xml");
+    TestObject obj1(1,1.1,"test",Utils::getDate(2008,1,1,0,0,0));
+    dba::XMLOStream stream(ar.getOStream());
+    stream.open();
+    stream.put(&obj1);
+  }
+  CPPUNIT_ASSERT(compareXML("simpleonestore.xml",result));
+};
+
+void
-XMLTestCase::storeVar() {
-  const char* result = 
@@ -155 +174 @@
-  };
-};
+
+void
+XMLTestCase::simpleOneLoad() {
+  const char* data = 
+"<?xml version=\"1.0\" encoding=\"utf-8\"?>\n"
+"<test_objects i_value=\"1\" f_value=\"1.1\" s_value=\"test\" d_value=\"2008-01-01Z00:00:00\"/>\n"
+;
+  { 
+    std::ofstream file("simpleoneload.xml");
+    file << data;
+  };
+  {
+    dba::XMLArchive ar;
+    ar.setRootNodeName(NULL);
+    ar.open("simpleoneload.xml");
+    TestObject obj1;
+    dba::XMLIStream stream(ar.getIStream());
+
+    stream.open(obj1);
+    CPPUNIT_ASSERT(stream.getNext(&obj1));
+
+    TestObject expected(1,1.1,"test",Utils::getDate(2008,1,1,0,0,0));
+    CPPUNIT_ASSERT(obj1 == expected);
+  };
+};
+
-
-void

trunk/dba/test/xmltestcase.h

@@ -29 +29 @@
-      CPPUNIT_TEST(encodingChange);
-      CPPUNIT_TEST(simpleStore);
+      CPPUNIT_TEST(simpleOneStore);
-      CPPUNIT_TEST(storeVar);
-      CPPUNIT_TEST(emptyLoad);
-      CPPUNIT_TEST(simpleLoad);
+      CPPUNIT_TEST(simpleOneLoad);
-      CPPUNIT_TEST(varLoad);
-      CPPUNIT_TEST(sublist_one_store);
@@ -53 +55 @@
-    void encodingChange();
-    void simpleStore();
+    void simpleOneStore();
-    void storeVar();
-    void emptyLoad();
-    void simpleLoad();
+    void simpleOneLoad();
-    void varLoad();
-    void sublist_one_store();

trunk/wxdba/wxdba/xmlarchive.cpp

@@ -12 +12 @@
-XMLArchive::SetRootNodeName(const wxString& pName) {
-  try {
-
+
+
+
+
-  } catch (const dba::Exception& pEx) {
-    Exception::Rethrow(pEx);