cvs commit: xml-xalan/java/src/org/apache/xpath/patterns NodeTest.java

[sboag]

sboag       00/07/31 21:40:57

  Modified:    java/src/org/apache/xpath/patterns NodeTest.java
  Log:
  Fixed * handling so it matches namespaced elements and attributes.
  
  Revision  Changes    Path
  1.2       +6 -4      
xml-xalan/java/src/org/apache/xpath/patterns/NodeTest.java
  
  Index: NodeTest.java
  ===================================================================
  RCS file: 
/home/cvs/xml-xalan/java/src/org/apache/xpath/patterns/NodeTest.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- NodeTest.java     2000/07/05 14:48:55     1.1
  +++ NodeTest.java     2000/08/01 04:40:57     1.2
  @@ -188,8 +188,9 @@
           if(0 == isNamespace)
           {
             if(!dh.isNamespaceNode(context))
  -            return (subPartMatch(dh.getNamespaceOfNode(context), 
m_namespace) 
  -                    && subPartMatch(dh.getLocalNameOfNode(context), m_name)) 
?
  +            return ((m_name == WILD) || 
  +                    (subPartMatch(dh.getNamespaceOfNode(context), 
m_namespace) 
  +                    && subPartMatch(dh.getLocalNameOfNode(context), 
m_name))) ?
                      m_score : SCORE_NONE;
             else
               return SCORE_NONE;
  @@ -210,8 +211,9 @@
       case NodeFilter.SHOW_ELEMENT:
         {
           DOMHelper dh = xctxt.getDOMHelper();
  -        return (subPartMatch(dh.getNamespaceOfNode(context), m_namespace) 
  -                && subPartMatch(dh.getLocalNameOfNode(context), m_name)) ?
  +        return ((m_name == WILD) ||
  +                (subPartMatch(dh.getNamespaceOfNode(context), m_namespace) 
  +                && subPartMatch(dh.getLocalNameOfNode(context), m_name))) ?
                  m_score : SCORE_NONE;
         }