not part of default build, fix for 75309, code by sicking, r=me, sr=shaver; fixes local-name and name for some node types

git-svn-id: svn://10.0.0.236/trunk@92081 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
axel%pike.org
2001-04-12 07:13:08 +00:00
parent 270847c7bc
commit 8c56812326

View File

@@ -24,14 +24,14 @@
* Marina Mechtcheriakova, mmarina@mindspring.com
* -- changed some behavoir to be more compliant with spec
*
* $Id: NodeSetFunctionCall.cpp,v 1.5 2001-04-08 14:37:39 peterv%netscape.com Exp $
* $Id: NodeSetFunctionCall.cpp,v 1.6 2001-04-12 07:13:08 axel%pike.org Exp $
*/
/**
* NodeSetFunctionCall
* A representation of the XPath NodeSet funtions
* @author <A HREF="mailto:kvisco@ziplink.net">Keith Visco</a>
* @version $Revision: 1.5 $ $Date: 2001-04-08 14:37:39 $
* @version $Revision: 1.6 $ $Date: 2001-04-12 07:13:08 $
**/
#include "FunctionLib.h"
@@ -188,13 +188,31 @@ ExprResult* NodeSetFunctionCall::evaluate(Node* context, ContextState* cs) {
switch ( type ) {
case LOCAL_NAME :
XMLUtils::getLocalPart(node->getNodeName(),name);
switch (node->getNodeType()) {
case Node::ATTRIBUTE_NODE :
case Node::ELEMENT_NODE :
case Node::PROCESSING_INSTRUCTION_NODE :
// XXX Namespace: namespaces have a local name
XMLUtils::getLocalPart(node->getNodeName(),name);
break;
default:
break;
}
break;
case NAMESPACE_URI :
XMLUtils::getNameSpace(node->getNodeName(),name);
break;
default:
name = node->getNodeName();
switch (node->getNodeType()) {
case Node::ATTRIBUTE_NODE :
case Node::ELEMENT_NODE :
case Node::PROCESSING_INSTRUCTION_NODE :
// XXX Namespace: namespaces have a name
name = node->getNodeName();
break;
default:
break;
}
break;
}
result = new StringResult(name);