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/03 20:30:08 UTC

cvs commit: xml-xalan/c/src/XalanSourceTree XalanSourceTreeParserLiaison.cpp XalanSourceTreeParserLiaison.hpp

dbertoni    01/01/03 11:30:08

  Modified:    c/src/XalanSourceTree XalanSourceTreeParserLiaison.cpp
                        XalanSourceTreeParserLiaison.hpp
  Log:
  Added optional DTDHandler and LexicalHandler parameters to a ParseXMLStream() overload.
  
  Revision  Changes    Path
  1.6       +6 -0      xml-xalan/c/src/XalanSourceTree/XalanSourceTreeParserLiaison.cpp
  
  Index: XalanSourceTreeParserLiaison.cpp
  ===================================================================
  RCS file: /home/cvs/xml-xalan/c/src/XalanSourceTree/XalanSourceTreeParserLiaison.cpp,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- XalanSourceTreeParserLiaison.cpp	2000/12/30 17:55:58	1.5
  +++ XalanSourceTreeParserLiaison.cpp	2001/01/03 19:30:06	1.6
  @@ -262,13 +262,19 @@
   XalanSourceTreeParserLiaison::parseXMLStream(
   			const InputSource&		theInputSource,
   			ContentHandler&			theContentHandler,
  +			DTDHandler*				theDTDHandler,
  +			LexicalHandler*			theLexicalHandler,
   			const XalanDOMString&	/* theIdentifier */)
   {
   	XalanAutoPtr<SAX2XMLReader>		theReader(XMLReaderFactory::createXMLReader());
   
   	theReader->setContentHandler(&theContentHandler);
   
  +	theReader->setDTDHandler(theDTDHandler);
  +
   	theReader->setErrorHandler(&m_xercesParserLiaison);
  +
  +	theReader->setLexicalHandler(theLexicalHandler);
   
   	theReader->parse(theInputSource);
   }
  
  
  
  1.3       +7 -1      xml-xalan/c/src/XalanSourceTree/XalanSourceTreeParserLiaison.hpp
  
  Index: XalanSourceTreeParserLiaison.hpp
  ===================================================================
  RCS file: /home/cvs/xml-xalan/c/src/XalanSourceTree/XalanSourceTreeParserLiaison.hpp,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- XalanSourceTreeParserLiaison.hpp	2000/12/30 17:55:59	1.2
  +++ XalanSourceTreeParserLiaison.hpp	2001/01/03 19:30:06	1.3
  @@ -74,6 +74,8 @@
   
   
   class ContentHandler;
  +class DTDHandler;
  +class LexicalHandler;
   class XalanSourceTreeDOMSupport;
   class XalanSourceTreeDocument;
   
  @@ -149,16 +151,20 @@
   	// These interfaces are new to XalanSourceTreeParserLiaison...
   
   	/**
  -	 * Parse using a SAX2 ContentHandler.
  +	 * Parse using a SAX2 ContentHandler, DTDHandler, and LexicalHandler.
   	 *
   	 * @param theInputSource The input source for the parser
   	 * @param theContentHandler The ContentHandler to use
  +	 * @param theDTDHandler The DTDHandler to use.  May be null.
  +	 * @param theLexicalHandler The LexicalHandler to use.  May be null.
   	 * @param identifier Used for error reporting only.
   	 */
   	virtual void
   	parseXMLStream(
   			const InputSource&		theInputSource,
   			ContentHandler&			theContentHandler,
  +			DTDHandler*				theDTDHandler = 0,
  +			LexicalHandler*			theLexicalHandler = 0,
   			const XalanDOMString&	theIdentifier = XalanDOMString());
   
   	/** Get the 'include ignorable whitespace' flag.