cvs commit: xml-xalan/c/src/XSLT XSLTProcessorEnvSupportDefault.cpp

[dbertoni]

dbertoni    2002/09/11 14:19:48

  Modified:    c/src/XSLT XSLTProcessorEnvSupportDefault.cpp
  Log:
  Fix for bug 10861.
  
  Revision  Changes    Path
  1.27      +26 -1     xml-xalan/c/src/XSLT/XSLTProcessorEnvSupportDefault.cpp
  
  Index: XSLTProcessorEnvSupportDefault.cpp
  ===================================================================
  RCS file: /home/cvs/xml-xalan/c/src/XSLT/XSLTProcessorEnvSupportDefault.cpp,v
  retrieving revision 1.26
  retrieving revision 1.27
  diff -u -r1.26 -r1.27
  --- XSLTProcessorEnvSupportDefault.cpp        23 Feb 2002 04:23:17 -0000      
1.26
  +++ XSLTProcessorEnvSupportDefault.cpp        11 Sep 2002 21:19:48 -0000      
1.27
  @@ -64,6 +64,7 @@
   
   
   
  +#include <xercesc/sax/EntityResolver.hpp>
   #include <xercesc/util/XMLURL.hpp>
   
   
  @@ -195,7 +196,31 @@
   
                        XSLTInputSource         inputSource(c_wstr(urlText));
   
  -                     theDocument = parserLiaison.parseXMLStream(inputSource);
  +                     EntityResolver* const   theResolver = 
  +                             parserLiaison.getEntityResolver();
  +
  +                     if (theResolver == 0)
  +                     {
  +                             const XSLTInputSource   
inputSource(c_wstr(urlText));
  +
  +                             theDocument = 
parserLiaison.parseXMLStream(inputSource);
  +                     }
  +                     else
  +                     {
  +                             const XalanAutoPtr<InputSource>         
resolverInputSource =
  +                                     theResolver->resolveEntity(0, 
c_wstr(urlText));
  +
  +                             if (resolverInputSource.get() != 0)
  +                             {
  +                                     theDocument = 
parserLiaison.parseXMLStream(*resolverInputSource.get());
  +                             }
  +                             else
  +                             {
  +                                     const XSLTInputSource   
inputSource(c_wstr(urlText));
  +
  +                                     theDocument = 
parserLiaison.parseXMLStream(inputSource);
  +                             }
  +                     }
   
                        if (theDocument != 0)
                        {
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]