tng 2003/02/05 14:07:19
Modified: c/src/xercesc/internal DGXMLScanner.cpp IGXMLScanner.cpp
Log:
[Bug 3111] Problem with LexicalHandler::startDTD() and LexicalHandler::endDTD().
Revision Changes Path
1.8 +3 -3 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.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- DGXMLScanner.cpp 5 Feb 2003 17:08:42 -0000 1.7
+++ DGXMLScanner.cpp 5 Feb 2003 22:07:18 -0000 1.8
@@ -974,7 +974,7 @@
fReaderMgr.pushReader(reader, declDTD);
// Tell it its not in an include section
- dtdScanner.scanExtSubsetDecl(false);
+ dtdScanner.scanExtSubsetDecl(false, true);
}
}
}
@@ -1729,7 +1729,7 @@
dtdScanner.setScannerInfo(this, &fReaderMgr, &fBufMgr);
// Tell it its not in an include section
- dtdScanner.scanExtSubsetDecl(false);
+ dtdScanner.scanExtSubsetDecl(false, true);
if (fValidate) {
// validate the DTD scan so far
1.8 +9 -9 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.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- IGXMLScanner.cpp 29 Jan 2003 19:59:35 -0000 1.7
+++ IGXMLScanner.cpp 5 Feb 2003 22:07:19 -0000 1.8
@@ -1061,7 +1061,7 @@
}
if(!isRoot && fGrammarType == Grammar::SchemaGrammarType)
((SchemaElementDecl
*)fElemStack.topElement()->fThisElement)->updateValidityFromElement(topElem->fThisElement,
fGrammarType);
-
+
// If we have a doc handler, tell it about the end tag
if (fDocHandler)
{
@@ -1371,7 +1371,7 @@
fReaderMgr.pushReader(reader, declDTD);
// Tell it its not in an include section
- dtdScanner.scanExtSubsetDecl(false);
+ dtdScanner.scanExtSubsetDecl(false, true);
}
}
}
@@ -2135,7 +2135,7 @@
);
errorBeforeElementFound = true;
}
- else if(errorCondition)
+ else if(errorCondition)
laxBeforeElementFound = true;
}
}
@@ -2279,7 +2279,7 @@
, elemDecl->getFullName()
);
- if(fGrammarType == Grammar::SchemaGrammarType)
+ if(fGrammarType == Grammar::SchemaGrammarType)
((SchemaElementDecl *)(elemDecl))->setValidity(PSVIDefs::INVALID);
}
}
@@ -2362,7 +2362,7 @@
, prefixBuf.getRawBuffer()
);
- if(fGrammarType == Grammar::SchemaGrammarType)
+ if(fGrammarType == Grammar::SchemaGrammarType)
((SchemaElementDecl
*)(elemDecl))->setValidity(PSVIDefs::INVALID);
}
@@ -2403,7 +2403,7 @@
if (fValidatorFromUser &&
!fValidator->checkRootElement(elemDecl->getId()))
fValidator->emitError(XMLValid::RootElemNotLikeDocType);
- if(fGrammarType == Grammar::SchemaGrammarType)
+ if(fGrammarType == Grammar::SchemaGrammarType)
((SchemaElementDecl *)(elemDecl))->setValidity(PSVIDefs::INVALID);
}
@@ -2487,7 +2487,7 @@
, elemDecl->getFullName()
, elemDecl->getFormattedContentModel()
);
- if(fGrammarType == Grammar::SchemaGrammarType)
+ if(fGrammarType == Grammar::SchemaGrammarType)
((SchemaElementDecl
*)(elemDecl))->setValidity(PSVIDefs::INVALID);
}
@@ -2888,7 +2888,7 @@
dtdScanner.setScannerInfo(this, &fReaderMgr, &fBufMgr);
// Tell it its not in an include section
- dtdScanner.scanExtSubsetDecl(false);
+ dtdScanner.scanExtSubsetDecl(false, true);
if (fValidate) {
// validate the DTD scan so far
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
