Changeset 154

Timestamp:

07/04/08 10:53:14 (6 months ago)

Author:

zork

Message:

namespace support for streams and element order for XMLOstream

Files:

• trunk/dba/dba.bkl (modified) (2 diffs)
• trunk/dba/dba/xmlarchive.cpp (modified) (3 diffs)
• trunk/dba/dba/xmlarchive.h (modified) (3 diffs)
• trunk/dba/dba/xmlistream.cpp (modified) (5 diffs)
• trunk/dba/dba/xmlistream.h (modified) (3 diffs)
• trunk/dba/dba/xmlostream.cpp (modified) (7 diffs)
• trunk/dba/dba/xmlostream.h (modified) (2 diffs)
• trunk/dba/dba/xmlutils.cpp (added)
• trunk/dba/dba/xmlutils.h (added)
• trunk/dba/test/main.cpp (modified) (1 diff)
• trunk/dba/test/testobject.cpp (modified) (1 diff)
• trunk/dba/test/testobject.h (modified) (1 diff)
• trunk/dba/test/xmltestcase.cpp (modified) (2 diffs)
• trunk/dba/test/xmltestcase.h (modified) (2 diffs)
• trunk/presets/syslibs.bkl (modified) (2 diffs)

trunk/dba/dba.bkl

@@ -199 +199 @@
-      dba/xmlistream.cpp
-      dba/xmlostream.cpp
+      dba/xmlutils.cpp
-    </sources>
-        <msvc-headers>
@@ -206 +207 @@
-      dba/xmlistream.h
-      dba/xmlostream.h
+      dba/xmlutils.h
-          </msvc-headers>
-  </template>

trunk/dba/dba/xmlarchive.cpp

@@ -55 +55 @@
-  } else {
-    mDocument = xmlNewDoc((const xmlChar*)"1.0");
+    xmlNodePtr node;
-    if (mRootNodeName != NULL) {
-
-
+
+
+
-    };
+    xmlDocSetRootElement(mDocument,node);
-  };
-  updateEncoding();
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-};
-
@@ -82 +90 @@
-  if (mRootNodeName != NULL)
-    root = root->children;
-
+mDocument,
-};
-
-OStream* 
-XMLArchive::getOutputStream() {
-
+RootNodeName != NULL,m
-};
-
@@ -95 +103 @@
-  if (mRootNodeName != NULL)
-    root = root->children;
-
+mDocument,
-};
-
-XMLOStream 
-XMLArchive::getOStream() {
-
+RootNodeName == NULL,m
-  return ret;
-};

trunk/dba/dba/xmlarchive.h

@@ -18 +18 @@
-#include "xmlerrorhandler.h"
-#include <libxml/tree.h>
+#include <list>
-
-namespace dba {
@@ -27 +28 @@
-  public:
-    XMLArchive();
+    /**
+      Set name of root node. If set to NULL then it is possible to IStream::get 
+      only one object from archive file pointed by root element, 
+      otherwise archive will try to get list of objects from subelement of root 
+      element in xml file
+      @param pName name of root object or NULL if elements from second level should be retrieved
+    */
-    void setRootNodeName(const char* pName);
+    /**
+      Add namespace to document. You have to call this method
+      if there are namespace prefixed members in class store table
+    */
+    void addNamespace(const char* pName, const char* pPrefix);
-    virtual void open(const char* pOpenStr);
-    /**
@@ -33 +46 @@
-    */
-    void close();
-RootNode
+Document
-    XMLOStream getOStream();
-    XMLIStream getIStream();

trunk/dba/dba/xmlistream.cpp

@@ -11 +11 @@
-//
-#include "xmlistream.h"
+#include "xmlutils.h"
-#include "collectionfilter.h"
-#include <iostream>
@@ -16 +17 @@
-namespace dba {
-
-
+DocPtr pDocument, xml
-  : IStream(),
-    ConvSpecContainer(pSpecs),
-
+
+
+
+
-{
-  mCurrentNode = findNonTextNode(mParentNode);
@@ -158 +162 @@
-};
-
+xmlAttrPtr
+XMLIStream::findAttribute(xmlNodePtr pNode, const char* pMemberName) {
+  char* ns = XMLUtils::getNsFromName(pMemberName);
+
+  xmlAttrPtr ret = NULL;
+  if (ns != NULL) {
+    xmlNsPtr nsptr = xmlSearchNs(mDocument,pNode,(xmlChar*)ns);
+    if (nsptr == NULL) {
+      std::string err("Error loading data from node '");
+      err += pMemberName;
+      err += "'. Namespace not added, call addNamespace on XMLArchive first";
+      throw APIException(err.c_str());
+    };
+    char* name = XMLUtils::getNameWithoutNs(pMemberName);
+    ret = xmlHasNsProp(pNode,(xmlChar*)name,nsptr->href);
+    delete [] name;
+  } else {
+    ret = xmlHasProp(pNode,(xmlChar*)pMemberName);
+  };
+  delete [] ns;
+  return ret;
+};
+
-void
-XMLIStream::applyFilters(Storeable* pObject) {
@@ -171 +198 @@
-      dba::StoreableFilterBase* filter(member->getFilter());
-      setFilterPtr(*filter,(char*)pObject + (int)(member->getMemberOffset() + tbl->getClassOffset()));
-xmlHasProp(mCurrentNode, (xmlChar*)
+findAttribute(mCurrentNode,
-      if (attr != NULL) {
-        xmlChar* xmldata = xmlNodeGetContent(attr->children);
@@ -205 +232 @@
-  for(VarMap::iterator it = mBindings.begin(); it != mBindings.end(); it++) {
-    if (!xmlStrcmp((xmlChar*)(it->mTable), mCurrentNode->name)) {
-xmlHasProp(mCurrentNode, (xmlChar*)
+findAttribute(mCurrentNode, 
-      dba::StoreableFilterBase& filter(*(it->mFilter));
-      if (attr != NULL) {

trunk/dba/dba/xmlistream.h

@@ -24 +24 @@
-class XMLIStream : public IStream, public XMLErrorHandler, public ConvSpecContainer {
-  public:
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    virtual void close();
-    virtual void destroy();
@@ -34 +47 @@
-    virtual ~XMLIStream();
-  private:
+    xmlDocPtr mDocument;
-    xmlNodePtr mParentNode;
-    xmlNodePtr mCurrentNode;
+    bool mIgnoreNonMappedNodes;
+    bool mIgnoreOrder;
-    
-    virtual void setIdsCondition(const char* pFKeyName, id pRelationId, const std::vector<id>& pIds);
@@ -45 +61 @@
-    bool isClassMember(Storeable* pObject, xmlNodePtr pNode);
-    void getChildren(Storeable* pParent, xmlNodePtr pNode);
+    xmlAttrPtr findAttribute(xmlNodePtr pNode, const char* pMemberName);
-};
-

trunk/dba/dba/xmlostream.cpp

@@ -13 +13 @@
-#include "conversion.h"
-#include "collectionfilter.h"
+#include "xmlutils.h"
-
-namespace dba {
-
-
+bool pReplaceParentNode, 
-  : OStream(),
-    ConvSpecContainer(pSpecs),
-    mDocument(pDocument),
-
+
+
-{
-}
@@ -49 +51 @@
-  //file is always created from scratch
-  return store(pObject);
+};
+
+void
+XMLOStream::setAttribute(xmlNodePtr pNode, const char* pName, const xmlChar* pData) {
+  char* nsname(XMLUtils::getNsFromName(pName));
+  if (nsname == NULL) {
+    xmlNewProp(pNode,(xmlChar*)pName,pData);
+  } else {
+    xmlNsPtr ns = xmlSearchNs(mDocument,pNode,(xmlChar*)nsname);
+    delete [] nsname;
+    if (ns == NULL) {
+      std::string err("Error setting attribute '");
+      err += pName;
+      err += "'. Namespace not added, call addNamespace on XMLArchive first";
+      throw APIException(err.c_str());
+    };
+    char* propname(XMLUtils::getNameWithoutNs(pName));
+    xmlNewNsProp(pNode,ns,(xmlChar*)propname,pData);
+    delete [] propname;
+  };
+};
+
+xmlNodePtr
+XMLOStream::createNode(const char* pName) {
+  char* nsname(XMLUtils::getNsFromName(pName));
+  xmlNsPtr ns = NULL;
+  xmlNodePtr node = NULL;
+  if (nsname != NULL) {
+    ns = xmlSearchNs(mDocument,mParentNode,(xmlChar*)nsname);
+    delete [] nsname;
+    if (ns == NULL) {
+      std::string err("Error creating node '");
+      err += pName;
+      err += "'. Namespace not added, call addNamespace on XMLArchive first";
+      throw APIException(err.c_str());
+    };
+    char* nodename(XMLUtils::getNameWithoutNs(pName));
+    node = xmlNewNode(ns, (xmlChar*)nodename);
+    delete [] nodename;
+  } else {
+    node = xmlNewNode(ns, (xmlChar*)pName);
+  };
+  return node;
-};
-
@@ -60 +105 @@
-    if (!filter.isNull()) {
-      std::string strdata(filter.toString(getConversionSpecs()));
-xmlNewProp(pNode,(xmlChar*)
+setAttribute(pNode,
-    };
-    member = member->next;
@@ -76 +121 @@
-      data = filter.toString(mConvSpecs);
-      if (!data.empty()) {
-xmlNewProp(pNode,(xmlChar*)
+setAttribute(pNode,
-      };
-    };
@@ -89 +134 @@
-
-  mt_class* current = mMemberList->mFirst;
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-  //FIXME add configuration for storing id?
-  //xmlNewProp(node,(xmlChar*)"id",(xmlChar*)(toStr(id).c_str()));
@@ -99 +158 @@
-      break;
-  };
-  if (mParentNode != NULL)
-    xmlAddChild(mParentNode, node);
-  else
-    xmlDocSetRootElement(mDocument,node);
-  return true;
-};
@@ -144 +199 @@
-    if (iterator->hasNext()) {
-      if (pMember.getFKeyName() != NULL) {
-xmlNewNode(NULL, (xmlChar*)
+createNode(
-        mParentNode = mParentNode->children;
-      };

trunk/dba/dba/xmlostream.h

@@ -24 +24 @@
-class XMLOStream  : public OStream, public XMLErrorHandler, public ConvSpecContainer {
-  public:
-
+bool pReplaceParentNode, 
-    virtual void close();
-    virtual void destroy();
@@ -45 +45 @@
-    xmlDocPtr mDocument;
-    xmlNodePtr mParentNode;
+    bool mReplaceParentNode;
-    
-    void updateNodeFromVars(xmlNodePtr pNode, mt_class* pTable);
-    void updateNodeFromObject(xmlNodePtr pNode, const Storeable& pObject, mt_class* pTable);
+    void setAttribute(xmlNodePtr pNode, const char* pName, const xmlChar* pData);
+    xmlNodePtr createNode(const char* pName);
-};
-

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

trunk/dba/test/testobject.cpp

@@ -122 +122 @@
-END_STORE_TABLE()
-
-
+
+

trunk/dba/test/testobject.h

@@ -605 +605 @@
-};
-
-
+ //namespace
-
-#endif

trunk/dba/test/xmltestcase.cpp

@@ -16 +16 @@
-#include "dba/string_filter.h"
-#include "dba/stdlist.h"
+#include "dba/single.h"
-
-#include <fstream>
@@ -531 +532 @@
-};
-
+class NsObject: public dba::Storeable {
+  DECLARE_STORE_TABLE();
+public:
+  NsObject() { }
+  NsObject(const std::string& pNsName)
+    : mNsName(pNsName)
+  {
+  }
+  virtual bool operator ==(const NsObject& pNsObject) const {
+    return (mNsName == pNsObject.mNsName);
+  }
+  std::string mNsName;
+};
+
+BEGIN_STORE_TABLE(NsObject, dba::Storeable, "nsobject")
+  BIND_STR(NsObject::mNsName, dba::String , "ns:name")
+END_STORE_TABLE();
+
+void
+XMLTestCase::load_missing_ns() {
+  const char* nsdata = 
+"<?xml version=\"1.0\" encoding=\"utf-8\"?>\n"
+" <nsobject name=\"test\" ns:name=\"namespace\">\n"
+" </nsobject>\n";
+  {
+    std::ofstream file("ns_missing.xml");
+    file << nsdata;
+  };
+  {
+    dba::XMLArchive xmlArch;
+    xmlArch.setRootNodeName("nsobject");
+    xmlArch.open("ns_missing.xml");
+    NsObject loaded;
+    dba::XMLIStream stream(xmlArch.getIStream());
+    try {
+      stream.get(&loaded);
+    } catch (const dba::APIException& pEx) {
+    };
+  };
+}
+
+void
+XMLTestCase::load_ns_single() {
+  const char* nsdata = 
+"<?xml version=\"1.0\" encoding=\"utf-8\"?>\n"
+" <nsobject xmlns:ns='http://bogus_ns_namespace' ns:name=\"namespace\" />\n"
+;
+  {
+    std::ofstream file("ns_load.xml");
+    file << nsdata;
+  };
+  {
+    NsObject expected("namespace");
+
+    dba::XMLArchive xmlArch;
+    xmlArch.setRootNodeName(NULL);
+    xmlArch.open("ns_load.xml");
+    NsObject loaded;
+    dba::XMLIStream stream(xmlArch.getIStream());
+    stream.get(&loaded);
+    CPPUNIT_ASSERT(loaded == expected);
+  };
+}
+
+void
+XMLTestCase::store_ns_single() {
+  const char* nsdata = 
+"<?xml version=\"1.0\" encoding=\"utf-8\"?>\n"
+"<nsobject xmlns:ns=\"http://bogus_ns_namespace\" ns:name=\"namespace\"/>\n"
+;
+  {
+    dba::XMLArchive xmlArch;
+    xmlArch.setRootNodeName(NULL);
+    unlink("ns_store.xml");
+    xmlArch.open("ns_store.xml");
+    xmlArch.addNamespace("http://bogus_ns_namespace","ns");
+    NsObject obj("namespace");
+    dba::XMLOStream stream(xmlArch.getOStream());
+    stream.put(&obj);
+  };
+  CPPUNIT_ASSERT(compareXML("ns_store.xml",nsdata));
+}
+
+void
+XMLTestCase::load_ns() {
+  const char* nsdata = 
+"<?xml version=\"1.0\" encoding=\"utf-8\"?>\n"
+"<dba xmlns:ns=\"http://bogus_ns_namespace\">\n"
+"  <nsobject ns:name=\"namespace\"/>\n"
+"</dba>\n"
+;
+  {
+    std::ofstream file("ns_load.xml");
+    file << nsdata;
+  };
+  {
+    NsObject expected("namespace");
+
+    dba::XMLArchive xmlArch;
+    xmlArch.open("ns_load.xml");
+    NsObject loaded;
+    dba::XMLIStream stream(xmlArch.getIStream());
+    stream.get(&loaded);
+    CPPUNIT_ASSERT(loaded == expected);
+  };
+}
+
+void
+XMLTestCase::store_ns() {
+  const char* nsdata = 
+"<?xml version=\"1.0\" encoding=\"utf-8\"?>\n"
+"<dba xmlns:ns=\"http://bogus_ns_namespace\">\n"
+"  <nsobject ns:name=\"namespace\"/>\n"
+"</dba>\n"
+;
+  {
+    dba::XMLArchive xmlArch;
+    unlink("ns_store.xml");
+    xmlArch.open("ns_store.xml");
+    xmlArch.addNamespace("http://bogus_ns_namespace","ns");
+    NsObject obj("namespace");
+    dba::XMLOStream stream(xmlArch.getOStream());
+    stream.put(&obj);
+  };
+  CPPUNIT_ASSERT(compareXML("ns_store.xml",nsdata));
+}
+
+class TwoSingles : public dba::Storeable {
+    DECLARE_STORE_TABLE();
+  public:
+    TwoSingles() {};
+    TwoSingles(const char* pName) 
+      : mName(pName),
+        mObj1(TestObject(1,1,"1",Utils::getDate(2008,1,1,0,0,0))),
+        mObj2(TestObject(20,20,"20",Utils::getDate(2008,2,2,0,0,0)))
+    {};
+    bool operator==(const TwoSingles& pObj) {
+      if (mName != pObj.mName)
+        return false;
+      return mObj1 == pObj.mObj1 && mObj2 == pObj.mObj2;
+    };
+    std::string mName;
+    TestObject mObj1;
+    TestObject mObj2;  
+};
+
+BEGIN_STORE_TABLE(TwoSingles,dba::Storeable,"twosingles")
+  BIND_STR(TwoSingles::mName, dba::String, "parent")
+  BIND_COL(TwoSingles::mObj1, dba::Single, NULL)
+  BIND_COL(TwoSingles::mObj2, dba::Single, NULL)
+END_STORE_TABLE()
+
+void
+XMLTestCase::load_two() {
+  const char* nsdata = 
+"<?xml version=\"1.0\" encoding=\"utf-8\"?>\n"
+"<dba>\n"
+"  <twosingles parent=\"parent_name\">\n"
+"    <test_objects i_value=\"1\" f_value=\"1\" s_value=\"1\" d_value=\"2008-01-01Z00:00:00\"/>\n"
+"    <test_objects i_value=\"20\" f_value=\"20\" s_value=\"20\" d_value=\"2008-02-02Z00:00:00\"/>\n"
+"  </twosingles>\n"
+"</dba>\n"
+;
+  {
+    std::ofstream file("load_two.xml");
+    file << nsdata;
+  };
+  {
+    TwoSingles expected("parent_name");
+
+    dba::XMLArchive xmlArch;
+    xmlArch.open("load_two.xml");
+    TwoSingles loaded;
+    dba::XMLIStream stream(xmlArch.getIStream());
+    stream.get(&loaded);
+    CPPUNIT_ASSERT(loaded == expected);
+  };
+};
+
+void
+XMLTestCase::store_two() {
+  const char* nsdata = 
+"<?xml version=\"1.0\" encoding=\"utf-8\"?>\n"
+"<dba>\n"
+"  <twosingles parent=\"parent_name\">\n"
+"    <test_objects i_value=\"1\" f_value=\"1\" s_value=\"1\" d_value=\"2008-01-01Z00:00:00\"/>\n"
+"    <test_objects i_value=\"20\" f_value=\"20\" s_value=\"20\" d_value=\"2008-02-02Z00:00:00\"/>\n"
+"  </twosingles>\n"
+"</dba>\n"
+;
+  {
+    dba::XMLArchive xmlArch;
+    unlink("store_two.xml");
+    xmlArch.open("store_two.xml");
+    TwoSingles obj("parent_name");
+    dba::XMLOStream stream(xmlArch.getOStream());
+    stream.put(&obj);
+  };
+  CPPUNIT_ASSERT(compareXML("store_two.xml",nsdata));
+}
+
+void
+XMLTestCase::load_two_inverted() {
+  const char* nsdata = 
+"<?xml version=\"1.0\" encoding=\"utf-8\"?>\n"
+"<dba>\n"
+"  <twosingles parent=\"parent_name\">\n"
+"    <test_objects i_value=\"20\" f_value=\"20\" s_value=\"20\" d_value=\"2008-02-02Z00:00:00\"/>\n"
+"    <test_objects i_value=\"1\" f_value=\"1\" s_value=\"1\" d_value=\"2008-01-01Z00:00:00\"/>\n"
+"  </twosingles>\n"
+"</dba>\n"
+;
+  {
+    std::ofstream file("load_two_inverted.xml");
+    file << nsdata;
+  };
+  {
+    TwoSingles expected("parent_name");
+
+    dba::XMLArchive xmlArch;
+    xmlArch.open("load_two_inverted.xml");
+    TwoSingles loaded;
+    dba::XMLIStream stream(xmlArch.getIStream());
+    stream.get(&loaded);
+    CPPUNIT_ASSERT(loaded == expected);
+  };
+};
+
-
-} //namespace

trunk/dba/test/xmltestcase.h

@@ -45 +45 @@
-      CPPUNIT_TEST(sublist_tree_load);
-      CPPUNIT_TEST(sublist_three_simple_load);
+      CPPUNIT_TEST(load_missing_ns);
+      CPPUNIT_TEST(load_ns_single);
+      CPPUNIT_TEST(store_ns_single);
+      CPPUNIT_TEST(load_ns);
+      CPPUNIT_TEST(store_ns);
+      CPPUNIT_TEST(load_two);
-    CPPUNIT_TEST_SUITE_END();
-  public:
@@ -71 +77 @@
-    void sublist_tree_load();
-    void sublist_three_simple_load();
+    void load_missing_ns();
+    void load_ns_single();
+    void store_ns_single();
+    void load_ns();
+    void store_ns();
+    void load_two();
+    void load_two_inverted();
+    void store_two();
-  private:
-    bool compareXML(const char* pFilename, const char* pData);

trunk/presets/syslibs.bkl

@@ -21 +21 @@
-  <if cond="FORMAT=='autoconf'">
-    <cxxflags>$(xml2_CXXFLAGS)</cxxflags>
-    <cxxflags>$(xslt_CXXFLAGS)</cxxflags>
-  </if>
-</template>
@@ -29 +28 @@
-    <if cond="TOOLSET=='win32'">
-      <sys-lib>libxml2</sys-lib>
-      <sys-lib>libexslt</sys-lib>
-      <sys-lib>libxslt</sys-lib>
-    </if>
-  </if>
-  <if cond="FORMAT=='autoconf'">
-    <ldlibs>$(xml2_LIBS)</ldlibs>
-    <ldlibs>$(xslt_LIBS)</ldlibs>
-  </if>
-</template>