OpenCascade/occt
1
0
Fork 0
mirror of https://git.dev.opencascade.org/repos/occt.git synced 2025-04-03 17:56:21 +03:00
Code Packages Releases Activity

0032299: Application Framework - Loading OCAF document saved with earlier version fails when using OCCT 7.5.1

Browse Source 
Keeping information about the file start instead of calling tellg. This fixes problem with not-seekable streams used for XML files reading and improves performance of XML files reading (about 10%), since tellg is quite long operation.
This commit is contained in:
mpv 2021-04-13 18:31:31 +03:00 committed by bugmaster
parent 623e54f9ac
commit 7b3a032f1e
4 changed files with 22 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/LDOM/LDOMParser.cxx
View File

@ -55,13 +55,14 @@ inline
#endif
LDOM_XmlReader::RecordType ReadRecord (LDOM_XmlReader& aReader,
Standard_IStream& theIStream,
LDOM_OSStream& aData)
LDOM_OSStream& aData,
Standard_Boolean& theDocStart)
{
#ifdef LDOM_PARSER_TRACE
static aCounter = 0;
++ aCounter;
#endif
const LDOM_XmlReader::RecordType aType = aReader.ReadRecord (theIStream, aData);
const LDOM_XmlReader::RecordType aType = aReader.ReadRecord (theIStream, aData, theDocStart);
#ifdef LDOM_PARSER_TRACE
static FILE * ff = NULL;
TCollection_AsciiString aTraceFileName;
@ -172,11 +173,13 @@ Standard_Boolean LDOMParser::ParseDocument (std::istream& theIStream, const Stan
Standard_Boolean isDoctype = Standard_False;
Standard_Boolean isInsertFictRootElement = Standard_False;
Standard_Boolean aDocStart = Standard_True;
for(;;) {
LDOM_XmlReader::RecordType aType = (theWithoutRoot && !isInsertFictRootElement ?
LDOM_XmlReader::XML_START_ELEMENT :
ReadRecord (*myReader, theIStream, myCurrentData));
ReadRecord (*myReader, theIStream, myCurrentData, aDocStart));
switch (aType) {
case LDOM_XmlReader::XML_HEADER:
if (isDoctype || isElement) {
@ -234,7 +237,7 @@ Standard_Boolean LDOMParser::ParseDocument (std::istream& theIStream, const Stan
myError = "User abort at startElement()";
break;
}
isError = ParseElement (theIStream);
isError = ParseElement (theIStream, aDocStart);
if (isError) break;
continue;
}
@ -266,7 +269,7 @@ Standard_Boolean LDOMParser::ParseDocument (std::istream& theIStream, const Stan
//purpose : parse one element, given the type of its XML presentation
//=======================================================================
Standard_Boolean LDOMParser::ParseElement (Standard_IStream& theIStream)
Standard_Boolean LDOMParser::ParseElement (Standard_IStream& theIStream, Standard_Boolean& theDocStart)
{
Standard_Boolean isError = Standard_False;
const LDOM_BasicElement * aParent = &myReader->GetElement();
@ -275,7 +278,7 @@ Standard_Boolean LDOMParser::ParseElement (Standard_IStream& theIStream)
LDOM_Node::NodeType aLocType;
LDOMBasicString aTextValue;
char *aTextStr;
LDOM_XmlReader::RecordType aType = ReadRecord (* myReader, theIStream, myCurrentData);
LDOM_XmlReader::RecordType aType = ReadRecord (* myReader, theIStream, myCurrentData, theDocStart);
switch (aType) {
case LDOM_XmlReader::XML_UNKNOWN:
isError = Standard_True;
@ -300,7 +303,7 @@ Standard_Boolean LDOMParser::ParseElement (Standard_IStream& theIStream)
myError = "User abort at startElement()";
break;
}
isError = ParseElement (theIStream);
isError = ParseElement (theIStream, theDocStart);
break;
case LDOM_XmlReader::XML_END_ELEMENT:
{

2
src/LDOM/LDOMParser.hxx
View File

@ -86,7 +86,7 @@ class LDOMParser
// ---------- PRIVATE METHODS ----------
Standard_Boolean ParseDocument (Standard_IStream& theIStream, const Standard_Boolean theWithoutRoot = Standard_False);
Standard_Boolean ParseElement (Standard_IStream& theIStream);
Standard_Boolean ParseElement (Standard_IStream& theIStream, Standard_Boolean& theDocStart);
// ---------- PRIVATE (PROHIBITED) METHODS ----------

8
src/LDOM/LDOM_XmlReader.cxx
View File

@ -84,7 +84,8 @@ LDOM_XmlReader::LDOM_XmlReader (
//=======================================================================
LDOM_XmlReader::RecordType LDOM_XmlReader::ReadRecord (Standard_IStream& theIStream,
LDOM_OSStream& theData)
LDOM_OSStream& theData,
Standard_Boolean& theDocStart)
{
theData.Clear();
myError.Clear();
@ -93,7 +94,6 @@ LDOM_XmlReader::RecordType LDOM_XmlReader::ReadRecord (Standard_IStream& theIStr
LDOMBasicString anAttrName, anAttrValue;
char anAttDelimiter = '\0';
Standard_Boolean aHasRead = Standard_False;
Standard_Boolean isFileStart = !myEOF && theIStream.tellg() == std::iostream::pos_type(0);
for(;;) {
// Check if the current file buffer is exhausted
@ -155,9 +155,9 @@ LDOM_XmlReader::RecordType LDOM_XmlReader::ReadRecord (Standard_IStream& theIStr
myBuffer[aBytesRest + aNBytes] = '\0';
}
}
if (isFileStart)
if (theDocStart && !myEOF)
{
isFileStart = Standard_False;
theDocStart = Standard_False;
// check for BOM block
Standard_Utf8UChar aFirstChar = Standard_Utf8UChar(myPtr[0]);
switch(aFirstChar) {

12
src/LDOM/LDOM_XmlReader.hxx
View File

@ -53,17 +53,19 @@ class LDOM_XmlReader
// Constructor - takes a file descriptor for input
// Constructor - takes an std::istream for input
RecordType ReadRecord (Standard_IStream& theIStream, LDOM_OSStream& theData);
RecordType ReadRecord (Standard_IStream& theIStream,
LDOM_OSStream& theData,
Standard_Boolean& theDocStart);
// reading a markup or other element of XML format
LDOM_BasicElement& GetElement () const { return * myElement; }
LDOM_BasicElement& GetElement() const { return * myElement; }
// get the last element retrieved from the stream
void CreateElement (const char *theName, const Standard_Integer theLen);
static Standard_Boolean getInteger (LDOMBasicString& theValue,
const char * theStart,
const char * theEnd);
static Standard_Boolean getInteger (LDOMBasicString& theValue,
const char * theStart,
const char * theEnd);
// try convert string theStart to LDOM_AsciiInteger, return False on success
// Returns the byte order mask defined at the start of a stream