You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xerces.apache.org by ga...@apache.org on 2003/04/30 17:50:23 UTC

cvs commit: xml-xerces/c/src/xercesc/parsers AbstractDOMParser.cpp

gareth      2003/04/30 08:50:23

  Modified:    c/src/xercesc/dom/impl DOMDocumentImpl.cpp
                        DOMDocumentImpl.hpp DOMEntityReferenceImpl.cpp
                        DOMEntityReferenceImpl.hpp
               c/src/xercesc/parsers AbstractDOMParser.cpp
  Log:
  Fix to the ever expanding entity problem. Big thanks to Tinny.
  
  Revision  Changes    Path
  1.34      +8 -1      xml-xerces/c/src/xercesc/dom/impl/DOMDocumentImpl.cpp
  
  Index: DOMDocumentImpl.cpp
  ===================================================================
  RCS file: /home/cvs/xml-xerces/c/src/xercesc/dom/impl/DOMDocumentImpl.cpp,v
  retrieving revision 1.33
  retrieving revision 1.34
  diff -u -r1.33 -r1.34
  --- DOMDocumentImpl.cpp	31 Mar 2003 15:48:23 -0000	1.33
  +++ DOMDocumentImpl.cpp	30 Apr 2003 15:50:22 -0000	1.34
  @@ -362,7 +362,14 @@
       return new (this, DOMDocumentImpl::ENTITY_REFERENCE_OBJECT) DOMEntityReferenceImpl(this, nam);
   };
   
  +DOMEntityReference *DOMDocumentImpl::createEntityReferenceByParser(const XMLCh *nam)
  +{
  +    if (!nam || !isXMLName(nam))
  +        throw DOMException(
  +        DOMException::INVALID_CHARACTER_ERR, 0);
   
  +    return new (this, DOMDocumentImpl::ENTITY_REFERENCE_OBJECT) DOMEntityReferenceImpl(this, nam, false);
  +};
   
   DOMNotation *DOMDocumentImpl::createNotation(const XMLCh *nam)
   {
  
  
  
  1.16      +5 -1      xml-xerces/c/src/xercesc/dom/impl/DOMDocumentImpl.hpp
  
  Index: DOMDocumentImpl.hpp
  ===================================================================
  RCS file: /home/cvs/xml-xerces/c/src/xercesc/dom/impl/DOMDocumentImpl.hpp,v
  retrieving revision 1.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- DOMDocumentImpl.hpp	31 Mar 2003 15:48:23 -0000	1.15
  +++ DOMDocumentImpl.hpp	30 Apr 2003 15:50:22 -0000	1.16
  @@ -197,6 +197,10 @@
       virtual void                 removeNodeIterator(DOMNodeIteratorImpl* nodeIterator); //non-standard api
   
   
  +    // Extension to be called by the Parser
  +    DOMEntityReference*  createEntityReferenceByParser(const XMLCh * name);
  +
  +
       //
       // Functions to keep track of document mutations, so that node list chached
       //   information can be invalidated.  One global changes counter per document.
  
  
  
  1.11      +30 -1     xml-xerces/c/src/xercesc/dom/impl/DOMEntityReferenceImpl.cpp
  
  Index: DOMEntityReferenceImpl.cpp
  ===================================================================
  RCS file: /home/cvs/xml-xerces/c/src/xercesc/dom/impl/DOMEntityReferenceImpl.cpp,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- DOMEntityReferenceImpl.cpp	4 Nov 2002 15:07:34 -0000	1.10
  +++ DOMEntityReferenceImpl.cpp	30 Apr 2003 15:50:22 -0000	1.11
  @@ -98,6 +98,35 @@
   }
   
   
  +DOMEntityReferenceImpl::DOMEntityReferenceImpl(DOMDocument *ownerDoc,
  +                                         const XMLCh *entityName,
  +                                         bool cloneChild)
  +    : fNode(ownerDoc), fParent(ownerDoc), fBaseURI(0)
  +{
  +    fName = ((DOMDocumentImpl *)getOwnerDocument())->getPooledString(entityName);
  +    // EntityReference behaves as a read-only node, since its contents
  +    // reflect the Entity it refers to -- but see setNodeName().
  +    //retrieve the corresponding entity content
  +
  +    if (ownerDoc) {
  +        if (ownerDoc->getDoctype()) {
  +            if (ownerDoc->getDoctype()->getEntities()) {
  +                DOMEntityImpl* entity = (DOMEntityImpl*)ownerDoc->getDoctype()->getEntities()->getNamedItem(entityName);
  +                if (entity) {
  +                    fBaseURI = entity->getBaseURI();
  +                    if (cloneChild) {
  +                        DOMEntityReference* refEntity = entity->getEntityRef();
  +                        if (refEntity) {
  +                            fParent.cloneChildren(refEntity);
  +                        }
  +                    }
  +                }
  +            }
  +        }
  +    }
  +
  +    fNode.setReadOnly(true, true);
  +}
   
   DOMEntityReferenceImpl::DOMEntityReferenceImpl(const DOMEntityReferenceImpl &other,
                                            bool deep)
  
  
  
  1.6       +2 -1      xml-xerces/c/src/xercesc/dom/impl/DOMEntityReferenceImpl.hpp
  
  Index: DOMEntityReferenceImpl.hpp
  ===================================================================
  RCS file: /home/cvs/xml-xerces/c/src/xercesc/dom/impl/DOMEntityReferenceImpl.hpp,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- DOMEntityReferenceImpl.hpp	3 Apr 2003 21:00:15 -0000	1.5
  +++ DOMEntityReferenceImpl.hpp	30 Apr 2003 15:50:22 -0000	1.6
  @@ -94,6 +94,7 @@
   
   public:
       DOMEntityReferenceImpl(DOMDocument *ownerDoc, const XMLCh *entityName);
  +    DOMEntityReferenceImpl(DOMDocument *ownerDoc, const XMLCh *entityName, bool cloneChild);
       DOMEntityReferenceImpl(const DOMEntityReferenceImpl &other, bool deep=false);
       virtual ~DOMEntityReferenceImpl();
   
  
  
  
  1.39      +2 -2      xml-xerces/c/src/xercesc/parsers/AbstractDOMParser.cpp
  
  Index: AbstractDOMParser.cpp
  ===================================================================
  RCS file: /home/cvs/xml-xerces/c/src/xercesc/parsers/AbstractDOMParser.cpp,v
  retrieving revision 1.38
  retrieving revision 1.39
  diff -u -r1.38 -r1.39
  --- AbstractDOMParser.cpp	17 Apr 2003 21:58:50 -0000	1.38
  +++ AbstractDOMParser.cpp	30 Apr 2003 15:50:23 -0000	1.39
  @@ -1015,7 +1015,7 @@
           entity->setActualEncoding(fScanner->getReaderMgr()->getCurrentEncodingStr());
       fCurrentEntity = entity;
   
  -    DOMEntityReference *er = fDocument->createEntityReference(entName);
  +    DOMEntityReference *er = fDocument->createEntityReferenceByParser(entName);
   
       //set the readOnly flag to false before appending node, will be reset in endEntityReference
       DOMEntityReferenceImpl *erImpl = (DOMEntityReferenceImpl *) er;
  
  
  

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