peiyongz 2003/06/25 12:31:30
Modified: c/src/xercesc/internal DGXMLScanner.cpp IGXMLScanner.cpp
IGXMLScanner2.cpp
Log:
using new putGrammar()
Revision Changes Path
1.17 +9 -5 xml-xerces/c/src/xercesc/internal/DGXMLScanner.cpp
Index: DGXMLScanner.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/internal/DGXMLScanner.cpp,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- DGXMLScanner.cpp 25 Jun 2003 18:57:20 -0000 1.16
+++ DGXMLScanner.cpp 25 Jun 2003 19:31:30 -0000 1.17
@@ -977,7 +977,8 @@
XMLDTDDescription* gramDesc =
fGrammarResolver->getGrammarPool()->createDTDDescription(XMLUni::fgDTDEntityString);
fGrammarResolver->orphanGrammar(gramDesc);
- fGrammarResolver->putGrammar(sysIdStr, fGrammar);
+ gramDesc->setRootName(sysIdStr);
+ fGrammarResolver->putGrammar(gramDesc, fGrammar);
}
// In order to make the processing work consistently, we have to
@@ -1679,7 +1680,8 @@
fValidator->reset();
fDTDGrammar = fGrammarResolver->getGrammarPool()->createDTDGrammar();
- fGrammarResolver->putGrammar(XMLUni::fgDTDEntityString, fDTDGrammar);
+ XMLDTDDescription* gramDesc =
fGrammarResolver->getGrammarPool()->createDTDDescription(XMLUni::fgDTDEntityString);
+ fGrammarResolver->putGrammar(gramDesc, fDTDGrammar);
fGrammar = fDTDGrammar;
fValidator->setGrammar(fGrammar);
@@ -1702,7 +1704,8 @@
XMLDTDDescription* gramDesc =
fGrammarResolver->getGrammarPool()->createDTDDescription(XMLUni::fgDTDEntityString);
fGrammarResolver->orphanGrammar(gramDesc);
- fGrammarResolver->putGrammar(sysIdStr, fGrammar);
+ gramDesc->setRootName(sysIdStr);
+ fGrammarResolver->putGrammar(gramDesc, fGrammar);
}
// Handle the creation of the XML reader object for this input source.
@@ -2034,7 +2037,8 @@
fGrammarResolver->useCachedGrammarInParse(fUseCachedGrammar);
fDTDGrammar = fGrammarResolver->getGrammarPool()->createDTDGrammar();
- fGrammarResolver->putGrammar(XMLUni::fgDTDEntityString, fDTDGrammar);
+ XMLDTDDescription* gramDesc =
fGrammarResolver->getGrammarPool()->createDTDDescription(XMLUni::fgDTDEntityString);
+ fGrammarResolver->putGrammar(gramDesc, fDTDGrammar);
fGrammar = fDTDGrammar;
fRootGrammar = 0;
fValidator->setGrammar(fGrammar);
1.16 +7 -4 xml-xerces/c/src/xercesc/internal/IGXMLScanner.cpp
Index: IGXMLScanner.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/internal/IGXMLScanner.cpp,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- IGXMLScanner.cpp 25 Jun 2003 18:57:20 -0000 1.15
+++ IGXMLScanner.cpp 25 Jun 2003 19:31:30 -0000 1.16
@@ -1383,7 +1383,8 @@
XMLDTDDescription* gramDesc =
fGrammarResolver->getGrammarPool()->createDTDDescription(XMLUni::fgDTDEntityString);
fGrammarResolver->orphanGrammar(gramDesc);
- fGrammarResolver->putGrammar(sysIdStr, fGrammar);
+ gramDesc->setRootName(sysIdStr);
+ fGrammarResolver->putGrammar(gramDesc, fGrammar);
}
// In order to make the processing work consistently, we have to
@@ -2849,7 +2850,8 @@
}
fDTDGrammar = fGrammarResolver->getGrammarPool()->createDTDGrammar();
- fGrammarResolver->putGrammar(XMLUni::fgDTDEntityString, fDTDGrammar);
+ XMLDTDDescription* gramDesc =
fGrammarResolver->getGrammarPool()->createDTDDescription(XMLUni::fgDTDEntityString);
+ fGrammarResolver->putGrammar(gramDesc, fDTDGrammar);
fGrammar = fDTDGrammar;
fGrammarType = fGrammar->getGrammarType();
fValidator->setGrammar(fGrammar);
@@ -2873,7 +2875,8 @@
XMLDTDDescription* gramDesc =
fGrammarResolver->getGrammarPool()->createDTDDescription(XMLUni::fgDTDEntityString);
fGrammarResolver->orphanGrammar(gramDesc);
- fGrammarResolver->putGrammar(sysIdStr, fGrammar);
+ gramDesc->setRootName(sysIdStr);
+ fGrammarResolver->putGrammar(gramDesc, fGrammar);
}
// Handle the creation of the XML reader object for this input source.
1.24 +4 -2 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.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- IGXMLScanner2.cpp 25 Jun 2003 17:25:33 -0000 1.23
+++ IGXMLScanner2.cpp 25 Jun 2003 19:31:30 -0000 1.24
@@ -78,6 +78,7 @@
#include <xercesc/framework/XMLPScanToken.hpp>
#include <xercesc/framework/XMLRefInfo.hpp>
#include <xercesc/framework/XMLGrammarPool.hpp>
+#include <xercesc/framework/XMLDTDDescription.hpp>
#include <xercesc/validators/common/ContentLeafNameTypeVector.hpp>
#include <xercesc/validators/DTD/DTDGrammar.hpp>
#include <xercesc/validators/DTD/DTDValidator.hpp>
@@ -866,7 +867,8 @@
fGrammarResolver->useCachedGrammarInParse(fUseCachedGrammar);
fDTDGrammar = fGrammarResolver->getGrammarPool()->createDTDGrammar();
- fGrammarResolver->putGrammar(XMLUni::fgDTDEntityString, fDTDGrammar);
+ XMLDTDDescription* gramDesc =
fGrammarResolver->getGrammarPool()->createDTDDescription(XMLUni::fgDTDEntityString);
+ fGrammarResolver->putGrammar(gramDesc, fDTDGrammar);
fGrammar = fDTDGrammar;
fGrammarType = fGrammar->getGrammarType();
fRootGrammar = 0;
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
