dbertoni 01/01/26 13:19:18
Modified: c/src/XSLT Stylesheet.cpp
Log:
Fixed bug with matching attributes with namespace prefixes.
Revision Changes Path
1.47 +8 -10 xml-xalan/c/src/XSLT/Stylesheet.cpp
Index: Stylesheet.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/Stylesheet.cpp,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- Stylesheet.cpp 2000/12/21 04:48:30 1.46
+++ Stylesheet.cpp 2001/01/26 21:19:18 1.47
@@ -748,18 +748,17 @@
switch(targetNodeType)
{
case XalanNode::ELEMENT_NODE:
- {
- const XalanDOMString& targetName =
DOMServices::getLocalNameOfNode(*targetNode);
-
- matchPatternList =
locateMatchPatternList2(targetName, true);
- }
+ matchPatternList =
locateMatchPatternList2(DOMServices::getLocalNameOfNode(*targetNode), true);
break;
case XalanNode::PROCESSING_INSTRUCTION_NODE:
- case XalanNode::ATTRIBUTE_NODE:
matchPatternList =
locateMatchPatternList2(targetNode->getNodeName(), true);
break;
+ case XalanNode::ATTRIBUTE_NODE:
+ matchPatternList =
locateMatchPatternList2(DOMServices::getLocalNameOfNode(*targetNode), true);
+ break;
+
case XalanNode::CDATA_SECTION_NODE:
case XalanNode::TEXT_NODE:
matchPatternList =
locateMatchPatternList2(XPath::PSEUDONAME_TEXT, true);
@@ -770,7 +769,7 @@
break;
case XalanNode::DOCUMENT_NODE:
- matchPatternList =
locateMatchPatternList2(XPath::PSEUDONAME_ROOT, false);
+ matchPatternList =
locateMatchPatternList2(XPath::PSEUDONAME_ROOT, false);
break;
case XalanNode::DOCUMENT_FRAGMENT_NODE:
@@ -778,9 +777,8 @@
break;
default:
- {
- matchPatternList =
locateMatchPatternList2(targetNode->getNodeName(), true);
- }
+ matchPatternList =
locateMatchPatternList2(targetNode->getNodeName(), true);
+ break;
}
if (matchPatternList != 0)
