xalan-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dbert...@apache.org
Subject cvs commit: xml-xalan/c/src/xalanc/XSLT Stylesheet.cpp
Date Mon, 15 Nov 2004 07:53:35 GMT
dbertoni    2004/11/14 23:53:35

  Modified:    c/src/xalanc/XSLT Stylesheet.cpp
  Log:
  Fixed bug where incorrect template was chosen when checking for conflicts.
  
  Revision  Changes    Path
  1.17      +9 -2      xml-xalan/c/src/xalanc/XSLT/Stylesheet.cpp
  
  Index: Stylesheet.cpp
  ===================================================================
  RCS file: /home/cvs/xml-xalan/c/src/xalanc/XSLT/Stylesheet.cpp,v
  retrieving revision 1.16
  retrieving revision 1.17
  diff -u -r1.16 -r1.17
  --- Stylesheet.cpp	14 Nov 2004 21:13:08 -0000	1.16
  +++ Stylesheet.cpp	15 Nov 2004 07:53:35 -0000	1.17
  @@ -1367,10 +1367,17 @@
                       XalanMessageLoader::getMessage(
                           XalanMessages::ConflictsFound,
                           conflictsString);
  -					
  +
  +                    // Since the templates are arranged by their
  +                    // priority and reverse order in the stylesheet,
  +                    // the template with the highest priority that
  +                    // was last in the stylesheet will be the
  +                    // first one in the array.
  +                    bestMatchedPattern = conflicts[0];
  +
   					bestMatchedRule = bestMatchedPattern->getTemplate();
   
  -					executionContext.warn(
  +                    executionContext.warn(
                           conflictsString,
                           targetNode,
                           bestMatchedRule->getLocator());
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: xalan-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: xalan-cvs-help@xml.apache.org


Mime
View raw message