-/*
- * Copyright 2001-2010 Internet2
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+/**
+ * Licensed to the University Corporation for Advanced Internet
+ * Development, Inc. (UCAID) under one or more contributor license
+ * agreements. See the NOTICE file distributed with this work for
+ * additional information regarding copyright ownership.
+ *
+ * UCAID licenses this file to you under the Apache License,
+ * Version 2.0 (the "License"); you may not use this file except
+ * in compliance with the License. You may obtain a copy of the
+ * License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+ * either express or implied. See the License for the specific
+ * language governing permissions and limitations under the License.
*/
/**
#include "util/XMLHelper.h"
#include "util/XMLConstants.h"
+#include <boost/lambda/bind.hpp>
+#include <boost/lambda/if.hpp>
+#include <boost/lambda/lambda.hpp>
#include <xercesc/framework/MemBufFormatTarget.hpp>
#include <xercesc/util/XMLUniDefs.hpp>
using namespace xmltooling;
using namespace xercesc;
+using namespace boost::lambda;
+using namespace boost;
using namespace std;
static const XMLCh type[]={chLatin_t, chLatin_y, chLatin_p, chLatin_e, chNull };
DOMNamedNodeMap* attributes = domElement->getAttributes();
DOMAttr* attribute;
- for(XMLSize_t i = 0; i < attributes->getLength(); i++) {
+ for(XMLSize_t i = 0; i < attributes->getLength(); ++i) {
attribute = static_cast<DOMAttr*>(attributes->item(i));
if(attribute->isId()) {
return attribute;
const XMLObject* ret;
const list<XMLObject*>& children = tree.getOrderedChildren();
- for (list<XMLObject*>::const_iterator i=children.begin(); i!=children.end(); ++i) {
+ for (list<XMLObject*>::const_iterator i = children.begin(); i != children.end(); ++i) {
if (*i) {
ret = getXMLObjectById(*(*i), id);
if (ret)
{
if (XMLString::equals(id, tree.getXMLID()))
return &tree;
-
+
XMLObject* ret;
const list<XMLObject*>& children = tree.getOrderedChildren();
- for (list<XMLObject*>::const_iterator i=children.begin(); i!=children.end(); ++i) {
+ for (list<XMLObject*>::const_iterator i = children.begin(); i != children.end(); ++i) {
if (*i) {
ret = getXMLObjectById(*(*i), id);
if (ret)
return nullptr;
}
-void XMLHelper::getNonVisiblyUsedPrefixes(const XMLObject& tree, set<xstring>& prefixes)
+void XMLHelper::getNonVisiblyUsedPrefixes(const XMLObject& tree, map<xstring,xstring>& prefixes)
{
- set<xstring> child_prefixes;
- const list<XMLObject*>& children = tree.getOrderedChildren();
- for (list<XMLObject*>::const_iterator i = children.begin(); i != children.end(); ++i) {
- if (*i)
+ map<xstring,xstring> child_prefixes;
+ for(list<XMLObject*>::const_iterator i = tree.getOrderedChildren().begin(); i != tree.getOrderedChildren().end(); ++i) {
+ if (*i) {
getNonVisiblyUsedPrefixes(*(*i), child_prefixes);
+ }
}
const set<Namespace>& nsset = tree.getNamespaces();
for (set<Namespace>::const_iterator ns = nsset.begin(); ns != nsset.end(); ++ns) {
case Namespace::Indeterminate:
break;
case Namespace::VisiblyUsed:
- child_prefixes.erase(ns->getNamespacePrefix() ? ns->getNamespacePrefix() : &chNull);
+ {
+ // See if the prefix was noted as non-visible below.
+ const XMLCh* p = ns->getNamespacePrefix() ? ns->getNamespacePrefix() : &chNull;
+ map<xstring,xstring>::iterator decl = child_prefixes.find(p);
+ if (decl != child_prefixes.end()) {
+ // It's declared below, see if it's the same namespace. If so, pull it from the set,
+ // otherwise leave it in the set.
+ if (decl->second == (ns->getNamespaceURI() ? ns->getNamespaceURI() : &chNull))
+ child_prefixes.erase(decl);
+ }
break;
+ }
case Namespace::NonVisiblyUsed:
- prefixes.insert(ns->getNamespacePrefix() ? ns->getNamespacePrefix() : &chNull);
+ // It may already be in the map from another branch of the tree, but as long
+ // as it's set to something so the parent knows about it, we're good.
+ prefixes[ns->getNamespacePrefix() ? ns->getNamespacePrefix() : &chNull] = (ns->getNamespaceURI() ? ns->getNamespaceURI() : &chNull);
break;
}
}
+
prefixes.insert(child_prefixes.begin(), child_prefixes.end());
}
if (!domNode)
return nullptr;
- int i;
const XMLCh* value=domNode->getTextContent();
- if (value && (i=XMLString::indexOf(value,chColon))>0) {
+ if (!value || !*value)
+ return nullptr;
+
+ int i;
+ if ((i=XMLString::indexOf(value,chColon))>0) {
XMLCh* prefix=new XMLCh[i+1];
XMLString::subString(prefix,value,0,i);
prefix[i]=chNull;
const XMLCh* XMLHelper::getTextContent(const DOMElement* e)
{
- DOMNode* child=e->getFirstChild();
+ DOMNode* child = e ? e->getFirstChild() : nullptr;
while (child) {
- if (child->getNodeType()==DOMNode::TEXT_NODE)
+ if (child->getNodeType() == DOMNode::TEXT_NODE)
return child->getNodeValue();
- child=child->getNextSibling();
+ child = child->getNextSibling();
}
return nullptr;
}
DOMElement* XMLHelper::getFirstChildElement(const DOMNode* n, const XMLCh* localName)
{
- DOMNode* child = n->getFirstChild();
+ DOMNode* child = n ? n->getFirstChild() : nullptr;
while (child && child->getNodeType() != DOMNode::ELEMENT_NODE)
child = child->getNextSibling();
if (child && localName) {
DOMElement* XMLHelper::getLastChildElement(const DOMNode* n, const XMLCh* localName)
{
- DOMNode* child = n->getLastChild();
+ DOMNode* child = n ? n->getLastChild() : nullptr;
while (child && child->getNodeType() != DOMNode::ELEMENT_NODE)
child = child->getPreviousSibling();
if (child && localName) {
DOMElement* XMLHelper::getNextSiblingElement(const DOMNode* n, const XMLCh* localName)
{
- DOMNode* sib = n->getNextSibling();
+ DOMNode* sib = n ? n->getNextSibling() : nullptr;
while (sib && sib->getNodeType() != DOMNode::ELEMENT_NODE)
sib = sib->getNextSibling();
if (sib && localName) {
DOMElement* XMLHelper::getPreviousSiblingElement(const DOMNode* n, const XMLCh* localName)
{
- DOMNode* sib = n->getPreviousSibling();
+ DOMNode* sib = n ? n->getPreviousSibling() : nullptr;
while (sib && sib->getNodeType() != DOMNode::ELEMENT_NODE)
sib = sib->getPreviousSibling();
if (sib && localName) {
if (e) {
const XMLCh* val = e->getAttributeNS(ns, localName);
if (val && *val) {
- int i = XMLString::parseInt(val);
- if (i)
- return i;
+ try {
+ return XMLString::parseInt(val);
+ }
+ catch (XMLException&) {
+ }
}
}
return defValue;
ostream& xmltooling::operator<<(ostream& ostr, const XMLObject& obj)
{
- return ostr << *(obj.marshall());
+ try {
+ return ostr << *(obj.marshall());
+ }
+ catch (DOMException& ex) {
+ auto_ptr_char msg(ex.getMessage());
+ throw XMLParserException(msg.get());
+ }
}
projects / shibboleth / cpp-xmltooling.git / blobdiff