You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xerces.apache.org by am...@apache.org on 2003/11/04 15:08:30 UTC
cvs commit: xml-xerces/c/src/xercesc/internal IGXMLScanner2.cpp ReaderMgr.cpp SGXMLScanner.cpp XMLScanner.cpp
amassari 2003/11/04 06:08:30
Modified: c/src/xercesc/internal IGXMLScanner2.cpp ReaderMgr.cpp
SGXMLScanner.cpp XMLScanner.cpp
Log:
When invoking resolveEntity, specify the base URI
Revision Changes Path
1.38 +7 -3 xml-xerces/c/src/xercesc/internal/IGXMLScanner2.cpp
Index: IGXMLScanner2.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/internal/IGXMLScanner2.cpp,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- IGXMLScanner2.cpp 1 Nov 2003 20:24:22 -0000 1.37
+++ IGXMLScanner2.cpp 4 Nov 2003 14:08:30 -0000 1.38
@@ -1392,8 +1392,10 @@
if (!fEntityHandler->expandSystemId(normalizedURI, expSysId))
expSysId.set(normalizedURI);
+ ReaderMgr::LastExtEntityInfo lastInfo;
+ fReaderMgr.getLastExtEntityInfo(lastInfo);
XMLResourceIdentifier resourceIdentifier(XMLResourceIdentifier::SchemaGrammar,
- expSysId.getRawBuffer(), uri);
+ expSysId.getRawBuffer(), uri, XMLUni::fgZeroLenString, lastInfo.systemId);
srcToFill = fEntityHandler->resolveEntity(&resourceIdentifier);
}
else
@@ -1568,8 +1570,10 @@
if (!fEntityHandler->expandSystemId(sysId, expSysId))
expSysId.set(sysId);
+ ReaderMgr::LastExtEntityInfo lastInfo;
+ fReaderMgr.getLastExtEntityInfo(lastInfo);
XMLResourceIdentifier resourceIdentifier(XMLResourceIdentifier::ExternalEntity,
- expSysId.getRawBuffer());
+ expSysId.getRawBuffer(), 0, XMLUni::fgZeroLenString, lastInfo.systemId);
srcToFill = fEntityHandler->resolveEntity(&resourceIdentifier);
}
else
1.19 +4 -2 xml-xerces/c/src/xercesc/internal/ReaderMgr.cpp
Index: ReaderMgr.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/internal/ReaderMgr.cpp,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- ReaderMgr.cpp 30 Oct 2003 21:37:31 -0000 1.18
+++ ReaderMgr.cpp 4 Nov 2003 14:08:30 -0000 1.19
@@ -528,8 +528,10 @@
srcToFill = 0;
if (fEntityHandler)
{
+ LastExtEntityInfo lastInfo;
+ getLastExtEntityInfo(lastInfo);
XMLResourceIdentifier resourceIdentifier(XMLResourceIdentifier::ExternalEntity,
- expSysId.getRawBuffer(), XMLUni::fgZeroLenString, pubId);
+ expSysId.getRawBuffer(), XMLUni::fgZeroLenString, pubId, lastInfo.systemId);
srcToFill = fEntityHandler->resolveEntity(&resourceIdentifier);
}
1.45 +7 -3 xml-xerces/c/src/xercesc/internal/SGXMLScanner.cpp
Index: SGXMLScanner.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/internal/SGXMLScanner.cpp,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- SGXMLScanner.cpp 1 Nov 2003 20:24:22 -0000 1.44
+++ SGXMLScanner.cpp 4 Nov 2003 14:08:30 -0000 1.45
@@ -3192,8 +3192,10 @@
if (!fEntityHandler->expandSystemId(normalizedURI, expSysId))
expSysId.set(normalizedURI);
+ ReaderMgr::LastExtEntityInfo lastInfo;
+ fReaderMgr.getLastExtEntityInfo(lastInfo);
XMLResourceIdentifier resourceIdentifier(XMLResourceIdentifier::SchemaGrammar,
- expSysId.getRawBuffer(), uri);
+ expSysId.getRawBuffer(), uri, XMLUni::fgZeroLenString, lastInfo.systemId);
srcToFill = fEntityHandler->resolveEntity(&resourceIdentifier);
}
else
@@ -3345,8 +3347,10 @@
if (!fEntityHandler->expandSystemId(sysId, expSysId))
expSysId.set(sysId);
+ ReaderMgr::LastExtEntityInfo lastInfo;
+ fReaderMgr.getLastExtEntityInfo(lastInfo);
XMLResourceIdentifier resourceIdentifier(XMLResourceIdentifier::ExternalEntity,
- expSysId.getRawBuffer());
+ expSysId.getRawBuffer(), 0, XMLUni::fgZeroLenString, lastInfo.systemId);
srcToFill = fEntityHandler->resolveEntity(&resourceIdentifier);
}
else
1.51 +4 -2 xml-xerces/c/src/xercesc/internal/XMLScanner.cpp
Index: XMLScanner.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/internal/XMLScanner.cpp,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- XMLScanner.cpp 30 Oct 2003 21:37:31 -0000 1.50
+++ XMLScanner.cpp 4 Nov 2003 14:08:30 -0000 1.51
@@ -1586,8 +1586,10 @@
InputSource* srcToUse = 0;
if (fEntityHandler){
+ ReaderMgr::LastExtEntityInfo lastInfo;
+ fReaderMgr.getLastExtEntityInfo(lastInfo);
XMLResourceIdentifier resourceIdentifier(XMLResourceIdentifier::ExternalEntity,
- systemId);
+ systemId, 0, XMLUni::fgZeroLenString, lastInfo.systemId);
srcToUse = fEntityHandler->resolveEntity(&resourceIdentifier);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: xerces-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: xerces-cvs-help@xml.apache.org