dbertoni 01/08/05 18:37:47
Modified: c/src/XercesParserLiaison XercesDocumentBridge.cpp
XercesDocumentBridge.hpp XercesParserLiaison.cpp
XercesParserLiaison.hpp
Log:
Implemented document instance number.
Revision Changes Path
1.18 +10 -0
xml-xalan/c/src/XercesParserLiaison/XercesDocumentBridge.cpp
Index: XercesDocumentBridge.cpp
===================================================================
RCS file:
/home/cvs/xml-xalan/c/src/XercesParserLiaison/XercesDocumentBridge.cpp,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- XercesDocumentBridge.cpp 2001/06/06 21:45:11 1.17
+++ XercesDocumentBridge.cpp 2001/08/06 01:37:47 1.18
@@ -103,9 +103,11 @@
XercesDocumentBridge::XercesDocumentBridge(
const DOM_Document& theXercesDocument,
+ unsigned long theNumber,
bool threadSafe,
bool buildBridge) :
XalanDocument(),
+ m_number(theNumber),
m_xercesDocument(theXercesDocument),
m_documentElement(0),
m_nodeMap(),
@@ -1537,6 +1539,14 @@
#else
static_cast<XalanElement*>(mapNode(theXercesNode));
#endif
+}
+
+
+
+unsigned long
+XercesDocumentBridge::getNumber() const
+{
+ return m_number;
}
1.15 +7 -1
xml-xalan/c/src/XercesParserLiaison/XercesDocumentBridge.hpp
Index: XercesDocumentBridge.hpp
===================================================================
RCS file:
/home/cvs/xml-xalan/c/src/XercesParserLiaison/XercesDocumentBridge.hpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- XercesDocumentBridge.hpp 2001/06/06 21:45:11 1.14
+++ XercesDocumentBridge.hpp 2001/08/06 01:37:47 1.15
@@ -134,12 +134,14 @@
* an unbuilt node at the same time.
*
* @param theXercesDocument The Xerces document to bridge
+ * @param theNumber The number of the document.
* @param threadSafe If true, the tree can safely be shared amongst
multiple threads. (Also implies buildBridge == true)
* @param buildBridge If true, all of the bridge nodes will be built
during construction.
*
*/
XercesDocumentBridge(
const DOM_Document& theXercesDocument,
+ unsigned long theNumber = ~0UL,
bool threadSafe =
true,
bool buildBridge =
true);
@@ -297,7 +299,9 @@
virtual XalanElement*
getElementById(const XalanDOMString& elementId) const;
-
+ virtual unsigned long
+ getNumber() const;
+
// These are some special interfaces to manage relationships between
// our nodes and Xerces nodes.
@@ -555,6 +559,8 @@
// This is a private helper class for building the tree...
friend class BuildBridgeTreeWalker;
+
+ const unsigned long
m_number;
// $$$ ToDo: This is because DOM_Document::getElementById() is not
// const...
1.36 +10 -1
xml-xalan/c/src/XercesParserLiaison/XercesParserLiaison.cpp
Index: XercesParserLiaison.cpp
===================================================================
RCS file:
/home/cvs/xml-xalan/c/src/XercesParserLiaison/XercesParserLiaison.cpp,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- XercesParserLiaison.cpp 2001/07/08 07:21:56 1.35
+++ XercesParserLiaison.cpp 2001/08/06 01:37:47 1.36
@@ -112,6 +112,7 @@
XercesParserLiaison::XercesParserLiaison(XercesDOMSupport& /* theSupport
*/) :
+ m_documentNumber(0),
m_indent(-1),
m_useValidation(false),
m_includeIgnorableWhitespace(true),
@@ -260,6 +261,14 @@
+unsigned long
+XercesParserLiaison::getDocumentNumber()
+{
+ return m_documentNumber++;
+}
+
+
+
int
XercesParserLiaison::getIndent() const
{
@@ -594,7 +603,7 @@
bool buildBridge)
{
XercesDocumentBridge* const theNewDocument =
- new XercesDocumentBridge(theXercesDocument, threadSafe,
buildBridge);
+ new XercesDocumentBridge(theXercesDocument, m_documentNumber++,
threadSafe, buildBridge);
m_documentMap[theNewDocument] = theNewDocument;
1.26 +5 -0
xml-xalan/c/src/XercesParserLiaison/XercesParserLiaison.hpp
Index: XercesParserLiaison.hpp
===================================================================
RCS file:
/home/cvs/xml-xalan/c/src/XercesParserLiaison/XercesParserLiaison.hpp,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- XercesParserLiaison.hpp 2001/07/08 07:21:55 1.25
+++ XercesParserLiaison.hpp 2001/08/06 01:37:47 1.26
@@ -145,6 +145,9 @@
virtual void
destroyDocument(XalanDocument* theDocument);
+ virtual unsigned long
+ getDocumentNumber();
+
virtual int
getIndent() const;
@@ -453,6 +456,8 @@
private:
// Data members...
+ unsigned long m_documentNumber;
+
int m_indent;
bool m_useValidation;
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
