Changeset 166

Timestamp:

07/18/08 17:15:56 (6 months ago)

Author:

zork

Message:

added support for bindings non collection members to xml elements (only)

Files:

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

trunk/dba/dba/xmlarchive.cpp

@@ -20 +20 @@
-  : Archive(),
-    mDocument(NULL),
-
+
+
-{
-  mConvSpecs.mTimestampFormat = "%Y-%m-%dZ%H:%M:%S";
@@ -90 +91 @@
-  if (mRootNodeName != NULL)
-    root = root->children;
-
+,mUseElements
-};
-
-OStream* 
-XMLArchive::getOutputStream() {
-
+,mUseElements
-};
-
@@ -103 +104 @@
-  if (mRootNodeName != NULL)
-    root = root->children;
-
+,mUseElements
-};
-
-XMLOStream 
-XMLArchive::getOStream() {
-
+,mUseElements
-  return ret;
-};

trunk/dba/dba/xmlarchive.h

@@ -47 +47 @@
-    void close();
-    virtual bool isOpen() const { return mDocument != NULL; }
+    void useElements(bool pFlag = true) { mUseElements = pFlag; }
-    XMLOStream getOStream();
-    XMLIStream getIStream();
@@ -68 +69 @@
-    */
-    std::string mFilename;
+    /**
+      should archive store/load members data from elements or attributes
+    */
+    bool mUseElements;
-    
-    /**

trunk/dba/dba/xmlistream.cpp

@@ -17 +17 @@
-namespace dba {
-
-
+, bool pUseElements
-  : IStream(),
-    ConvSpecContainer(pSpecs),
@@ -23 +23 @@
-    mParentNode(pNode),
-    mIgnoreNonMappedNodes(false),
-
+
+
-{
-  mCurrentNode = findNonTextNode(mParentNode);
@@ -193 +194 @@
-    if (!xmlNodeIsText(node) && !xmlStrcmp(name,node->name))
-      break;
-
+//
-  };
-
@@ -225 +226 @@
-      dba::StoreableFilterBase* filter(member->getFilter());
-      setFilterPtr(*filter,(char*)pObject + (int)(member->getMemberOffset() + tbl->getClassOffset()));
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-      } else {
-        filter->fromNull();

trunk/dba/dba/xmlistream.h

@@ -24 +24 @@
-class XMLIStream : public IStream, public XMLErrorHandler, public ConvSpecContainer {
-  public:
-
+, bool pUseElements
-    /**
-      If set to true, then stream will igore all nodes that are not mapped to class
@@ -53 +53 @@
-    bool mIgnoreNonMappedNodes;
-    bool mIgnoreOrder;
+    bool mUseElements;
-    
-    virtual void setIdsCondition(const char* pFKeyName, id pRelationId, const std::vector<id>& pIds);

trunk/dba/dba/xmlostream.cpp

@@ -17 +17 @@
-namespace dba {
-
-
+, bool pUseElements
-  : OStream(),
-    ConvSpecContainer(pSpecs),
-    mDocument(pDocument),
-    mParentNode(pNode),
-
+
+
-{
-}
@@ -105 +106 @@
-    if (!filter.isNull()) {
-      std::string strdata(filter.toString(getConversionSpecs()));
-setAttribute(pNode,member->name,(xmlChar*)
+updateNodeData(pNode,member->name,
-    };
-    member = member->next;
@@ -116 +117 @@
-XMLOStream::updateNodeFromVars(xmlNodePtr pNode, mt_class* pTable) {
-  for (VarMap::const_iterator it = mBindings.begin(); it != mBindings.end(); it++) {
-    std::string data;
-    if (!strcmp(it->mTable,pTable->name)) {
-      dba::StoreableFilterBase& filter = *(it->mFilter);
-data = filter.toString(mConvSpecs
+std::string data(filter.toString(mConvSpecs)
-      if (!data.empty()) {
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-  };
-};

trunk/dba/dba/xmlostream.h

@@ -24 +24 @@
-class XMLOStream  : public OStream, public XMLErrorHandler, public ConvSpecContainer {
-  public:
-
+, bool pUseElements
-    virtual void close();
-    virtual void destroy();
@@ -46 +46 @@
-    xmlNodePtr mParentNode;
-    bool mReplaceParentNode;
+    bool mUseElements;
-    
-    void updateNodeFromVars(xmlNodePtr pNode, mt_class* pTable);
@@ -51 +52 @@
-    void setAttribute(xmlNodePtr pNode, const char* pName, const xmlChar* pData);
-    xmlNodePtr createNode(const char* pName);
+    void updateNodeData(xmlNodePtr pNode, const char* pName, const char* pContent);
-};
-

trunk/dba/test/xmltestcase.cpp

@@ -775 +775 @@
-};
-
+void
+XMLTestCase::loadFromElements() {
+  const char* data = 
+"<?xml version=\"1.0\" encoding=\"utf-8\"?>\n"
+"<test_objects>\n"
+"  <i_value>1</i_value>\n"
+"  <f_value>1.1</f_value>\n"
+"  <s_value>test</s_value>\n"
+"  <d_value>2008-01-01Z00:00:00</d_value>\n"
+"</test_objects>\n"
+;
+  { 
+    std::ofstream file("loadfromelements.xml");
+    file << data;
+  };
+  {
+    dba::XMLArchive ar;
+    ar.setRootNodeName(NULL);
+    ar.useElements();
+    ar.open("loadfromelements.xml");
+    TestObject obj1;
+    dba::XMLIStream stream(ar.getIStream());
+    stream.enableDebug();
+    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
+XMLTestCase::storeToElements() {
+  const char* result = 
+"<?xml version=\"1.0\" encoding=\"utf-8\"?>\n"
+"<test_objects>\n"
+"  <i_value>1</i_value>\n"
+"  <f_value>1.1</f_value>\n"
+"  <s_value>test</s_value>\n"
+"  <d_value>2008-01-01Z00:00:00</d_value>\n"
+"</test_objects>\n"
+;
+  {
+    dba::XMLArchive ar;
+    ar.setRootNodeName(NULL);
+    ar.useElements();
+    unlink("storetoelements.xml");
+    ar.open("storetoelements.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("storetoelements.xml",result));
+};
+
-
-} //namespace

trunk/dba/test/xmltestcase.h

@@ -51 +51 @@
-      CPPUNIT_TEST(store_ns);
-      CPPUNIT_TEST(load_two);
+      CPPUNIT_TEST(loadFromElements);
+      CPPUNIT_TEST(storeToElements);
-    CPPUNIT_TEST_SUITE_END();
-  public:
@@ -85 +87 @@
-    void load_two_inverted();
-    void store_two();
+    void loadFromElements();
+    void storeToElements();
-  private:
-    bool compareXML(const char* pFilename, const char* pData);