You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xalan.apache.org by db...@apache.org on 2001/01/26 17:23:42 UTC
cvs commit: xml-xalan/c/src/XPath FunctionNamespaceURI.cpp
dbertoni 01/01/26 08:23:42
Modified: c/src/XPath FunctionNamespaceURI.cpp
Log:
Moved code into DOMServices::getNamespaceOfNode().
Revision Changes Path
1.11 +1 -26 xml-xalan/c/src/XPath/FunctionNamespaceURI.cpp
Index: FunctionNamespaceURI.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/FunctionNamespaceURI.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- FunctionNamespaceURI.cpp 2001/01/25 16:55:59 1.10
+++ FunctionNamespaceURI.cpp 2001/01/26 16:23:42 1.11
@@ -100,32 +100,7 @@
}
else
{
- const XalanDOMString* theResult = &theEmptyString;
-
- const XalanNode::NodeType theType = context->getNodeType();
-
- if (theType == XalanNode::ELEMENT_NODE)
- {
- theResult = &context->getNamespaceURI();
- }
- else if (theType == XalanNode::ATTRIBUTE_NODE)
- {
- const XalanDOMString& theNodeName = context->getNodeName();
-
- if (equals(theNodeName, DOMServices::s_XMLNamespace) == false &&
- startsWith(theNodeName, DOMServices::s_XMLNamespaceWithSeparator) == false)
- {
- theResult = &context->getNamespaceURI();
- }
- }
- else
- {
- theResult = &context->getNamespaceURI();
- }
-
- assert(theResult != 0);
-
- return executionContext.getXObjectFactory().createStringReference(*theResult);
+ return executionContext.getXObjectFactory().createStringReference(DOMServices::getNamespaceOfNode(*context));
}
}