/*
-Copyright (c) 2005-2009, John Hurst
+Copyright (c) 2005-2010, John Hurst
All rights reserved.
Redistribution and use in source and binary forms, with or without
#include <stack>
#include <map>
-//#undef HAVE_EXPAT
-//#define HAVE_XERCES_C
-
#ifdef HAVE_EXPAT
# ifdef HAVE_XERCES_C
# error "Both HAVE_EXPAT and HAVE_XERCES_C defined"
#include <xercesc/util/PlatformUtils.hpp>
#include <xercesc/util/XMLString.hpp>
+#include <xercesc/util/TransService.hpp>
#include <xercesc/sax/AttributeList.hpp>
#include <xercesc/sax/HandlerBase.hpp>
#include <xercesc/sax/ErrorHandler.hpp>
XERCES_CPP_NAMESPACE_USE
+
+namespace Kumu {
+ void init_xml_dom();
+ typedef std::basic_string<XMLCh> XercesString;
+ bool UTF_8_to_XercesString(const std::string& in_str, XercesString& out_str);
+ bool UTF_8_to_XercesString(const char* in_str, XercesString& out_str);
+ bool XercesString_to_UTF_8(const XercesString& in_str, std::string& out_str);
+ bool XercesString_to_UTF_8(const XMLCh* in_str, std::string& out_str);
+}
+
#endif
using namespace Kumu;
Kumu::XMLElement::DeleteAttrWithName(const char* name)
{
assert(name);
- AttributeList::iterator i;
- for ( i = m_AttrList.begin(); i != m_AttrList.end(); i++ )
+ AttributeList::iterator i = m_AttrList.begin();
+
+ while ( i != m_AttrList.end() )
{
if ( i->name == std::string(name) )
- m_AttrList.erase(i);
+ m_AttrList.erase(i++);
+ else
+ ++i;
}
}
void
Kumu::XMLElement::DeleteChildren()
{
- for ( ElementList::iterator i = m_ChildList.begin(); i != m_ChildList.end(); i++ )
+ while ( ! m_ChildList.empty() )
{
- delete *i;
- m_ChildList.erase(i);
+ delete m_ChildList.back();
+ m_ChildList.pop_back();
}
}
#ifdef HAVE_XERCES_C
-static Mutex sg_Lock;
-static bool sg_xml_init = false;
+static Mutex sg_xerces_init_lock; // protect the xerces initialized
+static bool sg_xml_init = false; // signal initialization
+static Mutex sg_coder_lock; // protect the transcoder context
+static XMLTranscoder* sg_coder = 0;
+static const int sg_coder_buf_len = 128 * 1024;
+static char sg_coder_buf[sg_coder_buf_len + 8];
+static unsigned char sg_coder_counts[sg_coder_buf_len / sizeof(XMLCh)]; // see XMLTranscoder::transcodeFrom
+static const XMLCh sg_LS[] = { chLatin_L, chLatin_S, chNull };
+static const XMLCh sg_label_UTF_8[] = { chLatin_U, chLatin_T, chLatin_F,
+ chDash, chDigit_8, chNull};
//
void
-asdcp_init_xml_dom()
+Kumu::init_xml_dom()
{
if ( ! sg_xml_init )
{
- AutoMutex AL(sg_Lock);
+ AutoMutex AL(sg_xerces_init_lock);
if ( ! sg_xml_init )
{
{
XMLPlatformUtils::Initialize();
sg_xml_init = true;
+
+ XMLTransService::Codes ret;
+ sg_coder = XMLPlatformUtils::fgTransService->makeNewTranscoderFor(sg_label_UTF_8, ret, sg_coder_buf_len);
+
+ if ( ret != XMLTransService::Ok )
+ {
+ const char* message = "Undefined Error";
+
+ switch ( ret )
+ {
+ case XMLTransService::UnsupportedEncoding: message = "Unsupported encoding"; break;
+ case XMLTransService::InternalFailure: message = "Internal failure"; break;
+ case XMLTransService::SupportFilesNotFound: message = "Support files not found"; break;
+ }
+
+ DefaultLogSink().Error("Xerces transform initialization error: %s\n", message);
+ }
}
catch (const XMLException &e)
{
}
}
+//
+bool
+Kumu::XercesString_to_UTF_8(const Kumu::XercesString& in_str, std::string& out_str) {
+ return XercesString_to_UTF_8(in_str.c_str(), out_str);
+}
+
+//
+bool
+Kumu::XercesString_to_UTF_8(const XMLCh* in_str, std::string& out_str)
+{
+ assert(in_str);
+ assert(sg_xml_init);
+ AutoMutex AL(sg_coder_lock);
+ ui32_t str_len = XMLString::stringLen(in_str);
+ ui32_t read_total = 0;
+
+ try
+ {
+ while ( str_len > 0 )
+ {
+ ui32_t read_count = 0;
+ ui32_t write_count = sg_coder->transcodeTo(in_str + read_total, str_len,
+ (XMLByte*)sg_coder_buf, sg_coder_buf_len,
+ read_count, XMLTranscoder::UnRep_Throw);
+
+ out_str.append(sg_coder_buf, write_count);
+ str_len -= read_count;
+ read_total += read_count;
+ assert(str_len >= 0);
+ }
+ }
+ catch (...)
+ {
+ return false;
+ }
+
+ return true;
+}
+
+//
+bool
+Kumu::UTF_8_to_XercesString(const std::string& in_str, Kumu::XercesString& out_str) {
+ return UTF_8_to_XercesString(in_str.c_str(), out_str);
+}
+
+//
+bool
+Kumu::UTF_8_to_XercesString(const char* in_str, Kumu::XercesString& out_str)
+{
+ assert(in_str);
+ assert(sg_xml_init);
+ AutoMutex AL(sg_coder_lock);
+ ui32_t str_len = strlen(in_str);
+ ui32_t read_total = 0;
+
+ try
+ {
+ while ( str_len > 0 )
+ {
+ ui32_t read_count = 0;
+ ui32_t write_count = sg_coder->transcodeFrom((const XMLByte*)(in_str + read_total), str_len,
+ (XMLCh*)sg_coder_buf, sg_coder_buf_len / sizeof(XMLCh),
+ read_count, sg_coder_counts);
+
+ out_str.append((XMLCh*)sg_coder_buf, write_count * sizeof(XMLCh));
+ str_len -= read_count;
+ read_total += read_count;
+ assert(str_len >= 0);
+ }
+ }
+ catch (...)
+ {
+ return false;
+ }
+
+ return true;
+}
//
class MyTreeHandler : public HandlerBase
ns_map* m_Namespaces;
std::stack<XMLElement*> m_Scope;
XMLElement* m_Root;
+ bool m_HasEncodeErrors;
public:
- MyTreeHandler(XMLElement* root) : m_Namespaces(0), m_Root(root) {
+ MyTreeHandler(XMLElement* root) : m_Namespaces(0), m_Root(root), m_HasEncodeErrors(false)
+ {
assert(m_Root);
m_Namespaces = new ns_map;
}
delete m_Namespaces;
}
- ns_map* TakeNamespaceMap() {
+ bool HasEncodeErrors() const { return m_HasEncodeErrors; }
+
+ ns_map* TakeNamespaceMap()
+ {
if ( m_Namespaces == 0 || m_Namespaces->empty() )
return 0;
XERCES_CPP_NAMESPACE::AttributeList& attributes)
{
assert(x_name);
+ std::string tx_name;
- const char* tx_name = XMLString::transcode(x_name);
- const char* name = tx_name;
+ if ( ! XercesString_to_UTF_8(x_name, tx_name) )
+ m_HasEncodeErrors = true;
+
+ const char* name = tx_name.c_str();
XMLElement* Element;
const char* ns_root = name;
const char* local_name = strchr(name, ':');
for ( ui32_t i = 0; i < a_len; i++)
{
- const XMLCh* aname = attributes.getName(i);
- const XMLCh* value = attributes.getValue(i);
- assert(aname);
- assert(value);
+ std::string aname, value;
+ if ( ! XercesString_to_UTF_8(attributes.getName(i), aname) )
+ m_HasEncodeErrors = true;
+
+ if ( ! XercesString_to_UTF_8(attributes.getValue(i), value) )
+ m_HasEncodeErrors = true;
- char* x_aname = XMLString::transcode(aname);
- char* x_value = XMLString::transcode(value);
+ const char* x_aname = aname.c_str();
+ const char* x_value = value.c_str();
if ( strncmp(x_aname, "xmlns", 5) == 0 )
AddNamespace(x_aname+5, x_value);
local_name++;
Element->SetAttr(local_name, x_value);
-
- XMLString::release(&x_aname);
- XMLString::release(&x_value);
}
// map the namespace
ns_map::iterator ni = m_Namespaces->find(key);
if ( ni != m_Namespaces->end() )
Element->SetNamespace(ni->second);
-
- XMLString::release((char**)&tx_name);
}
void endElement(const XMLCh *const name) {
{
if ( length > 0 )
{
- char* text = XMLString::transcode(chars);
- m_Scope.top()->AppendBody(text);
- XMLString::release(&text);
+ std::string tmp;
+ if ( ! XercesString_to_UTF_8(chars, tmp) )
+ m_HasEncodeErrors = true;
+
+ m_Scope.top()->AppendBody(tmp);
}
}
};
if ( document.empty() )
return false;
- asdcp_init_xml_dom();
+ init_xml_dom();
int errorCount = 0;
SAXParser* parser = new SAXParser();
- parser->setDoValidation(true);
+
+ parser->setValidationScheme(SAXParser::Val_Always);
parser->setDoNamespaces(true); // optional
MyTreeHandler* docHandler = new MyTreeHandler(this);
- ErrorHandler* errHandler = (ErrorHandler*)docHandler;
parser->setDocumentHandler(docHandler);
+ parser->setErrorHandler(docHandler);
try
{
if ( document == 0 || *document == 0 )
return false;
- asdcp_init_xml_dom();
+ init_xml_dom();
if ( len == 0 )
len = strlen(document);
bool
Kumu::XMLElement::ParseString(const std::string& document)
{
- DefaultLogSink().Error("asdcplib compiled without XML parser support.\n");
+ DefaultLogSink().Error("Kumu compiled without XML parser support.\n");
return false;
}
projects / asdcplib.git / blobdiff