dbertoni 00/08/14 15:07:31
Modified: c/src/XPath XPathEnvSupport.hpp XPathEnvSupportDefault.cpp
XPathEnvSupportDefault.hpp
XPathExecutionContext.hpp
XPathExecutionContextDefault.cpp
XPathExecutionContextDefault.hpp
Log:
Fixes for thread-safety problem with initializing keys.
Revision Changes Path
1.11 +0 -23 xml-xalan/c/src/XPath/XPathEnvSupport.hpp
Index: XPathEnvSupport.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/XPathEnvSupport.hpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- XPathEnvSupport.hpp 2000/07/21 19:50:03 1.10
+++ XPathEnvSupport.hpp 2000/08/14 22:07:23 1.11
@@ -109,29 +109,6 @@
virtual
~XPathEnvSupport();
-
- /**
- * Given a valid element key, return the corresponding node list.
- *
- * @param doc source document
- * @param name name of the key, which must match the 'name'
- * attribute on xsl:key
- * @param ref value that must match the value found by the
- * 'match' attribute on xsl:key
- * @param resolver resolver for namespace resolution
- * @param executionContext current execution context
- * @return if the name was not declared with xsl:key, this will return
- * null, if the identifier is not found, it will return an empty
- * node set, otherwise it will return a nodeset of nodes.
- */
- virtual const NodeRefListBase*
- getNodeSetByKey(
- const XalanNode& doc,
- const XalanDOMString& name,
- const XalanDOMString& ref,
- const PrefixResolver& resolver,
- XPathExecutionContext& executionContext) const = 0;
-
/**
* Provides support for XML parsing service.
*
1.15 +0 -13 xml-xalan/c/src/XPath/XPathEnvSupportDefault.cpp
Index: XPathEnvSupportDefault.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/XPathEnvSupportDefault.cpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- XPathEnvSupportDefault.cpp 2000/08/07 19:51:48 1.14
+++ XPathEnvSupportDefault.cpp 2000/08/14 22:07:24 1.15
@@ -215,19 +215,6 @@
-const NodeRefListBase*
-XPathEnvSupportDefault::getNodeSetByKey(
- const XalanNode& /* doc */,
- const XalanDOMString& /* name */,
- const XalanDOMString& /* ref */,
- const PrefixResolver& /* resolver */,
- XPathExecutionContext& /* executionContext */) const
-{
- return 0;
-}
-
-
-
XalanDocument*
XPathEnvSupportDefault::parseXML(
const XalanDOMString& /* urlString */,
1.13 +0 -8 xml-xalan/c/src/XPath/XPathEnvSupportDefault.hpp
Index: XPathEnvSupportDefault.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/XPathEnvSupportDefault.hpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- XPathEnvSupportDefault.hpp 2000/08/07 19:51:48 1.12
+++ XPathEnvSupportDefault.hpp 2000/08/14 22:07:24 1.13
@@ -145,14 +145,6 @@
// These interfaces are inherited from XPathEnvSupport...
- virtual const NodeRefListBase*
- getNodeSetByKey(
- const XalanNode& doc,
- const XalanDOMString& name,
- const XalanDOMString& ref,
- const PrefixResolver& resolver,
- XPathExecutionContext& executionContext) const;
-
virtual XalanDocument*
parseXML(
const XalanDOMString& urlString,
1.20 +1 -39 xml-xalan/c/src/XPath/XPathExecutionContext.hpp
Index: XPathExecutionContext.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/XPathExecutionContext.hpp,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- XPathExecutionContext.hpp 2000/08/14 16:33:57 1.19
+++ XPathExecutionContext.hpp 2000/08/14 22:07:24 1.20
@@ -547,44 +547,6 @@
* attribute on xsl:key
* @param ref value that must match the value found by the
* 'match' attribute on xsl:key
- * @param nscontext context node for namespace resolution
- * @return if the name was not declared with xsl:key, this will return
- * null, if the identifier is not found, it will return an empty
- * node set, otherwise it will return a nodeset of nodes.
- */
- virtual const NodeRefListBase*
- getNodeSetByKey(
- const XalanNode& doc,
- const XalanDOMString& name,
- const XalanDOMString& ref,
- const XalanElement& nscontext) = 0;
-
- /**
- * Given a valid element key, return the corresponding node list.
- *
- * @param doc source document
- * @param name name of the key, which must match the 'name'
- * attribute on xsl:key
- * @param ref value that must match the value found by the
- * 'match' attribute on xsl:key
- * @return if the name was not declared with xsl:key, this will return
- * null, if the identifier is not found, it will return an empty
- * node set, otherwise it will return a nodeset of nodes.
- */
- virtual const NodeRefListBase*
- getNodeSetByKey(
- const XalanNode& doc,
- const XalanDOMString& name,
- const XalanDOMString& ref) = 0;
-
- /**
- * Given a valid element key, return the corresponding node list.
- *
- * @param doc source document
- * @param name name of the key, which must match the 'name'
- * attribute on xsl:key
- * @param ref value that must match the value found by the
- * 'match' attribute on xsl:key
* @param resolver resolver for namespace resolution
* @return if the name was not declared with xsl:key, this will return
* null, if the identifier is not found, it will return an empty
@@ -592,7 +554,7 @@
*/
virtual const NodeRefListBase*
getNodeSetByKey(
- const XalanNode& doc,
+ XalanNode* doc,
const XalanDOMString& name,
const XalanDOMString& ref,
const PrefixResolver& resolver) = 0;
1.18 +6 -42 xml-xalan/c/src/XPath/XPathExecutionContextDefault.cpp
Index: XPathExecutionContextDefault.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/XPathExecutionContextDefault.cpp,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- XPathExecutionContextDefault.cpp 2000/08/14 16:33:58 1.17
+++ XPathExecutionContextDefault.cpp 2000/08/14 22:07:25 1.18
@@ -66,7 +66,6 @@
-#include "ElementPrefixResolverProxy.hpp"
#include "FoundIndex.hpp"
#include "XObjectFactory.hpp"
#include "PrefixResolver.hpp"
@@ -455,47 +454,12 @@
const NodeRefListBase*
XPathExecutionContextDefault::getNodeSetByKey(
- const XalanNode& doc,
- const XalanDOMString& name,
- const XalanDOMString& ref,
- const XalanElement& nscontext)
-{
- return getNodeSetByKey(doc,
- name,
- ref,
-
ElementPrefixResolverProxy(&nscontext, m_xpathEnvSupport, m_xpathSupport));
-}
-
-
-
-const NodeRefListBase*
-XPathExecutionContextDefault::getNodeSetByKey(
- const XalanNode& doc,
- const XalanDOMString& name,
- const XalanDOMString& ref)
-{
- assert(m_prefixResolver != 0);
-
- return getNodeSetByKey(doc,
- name,
- ref,
- *m_prefixResolver);
-}
-
-
-
-const NodeRefListBase*
-XPathExecutionContextDefault::getNodeSetByKey(
- const XalanNode& doc,
- const XalanDOMString& name,
- const XalanDOMString& ref,
- const PrefixResolver& resolver)
-{
- return m_xpathEnvSupport.getNodeSetByKey(doc,
-
name,
-
ref,
-
resolver,
-
*this);
+ XalanNode* /* doc */,
+ const XalanDOMString& /* name */,
+ const XalanDOMString& /* ref */,
+ const PrefixResolver& /* resolver */)
+{
+ return 0;
}
1.19 +1 -14 xml-xalan/c/src/XPath/XPathExecutionContextDefault.hpp
Index: XPathExecutionContextDefault.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/XPathExecutionContextDefault.hpp,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- XPathExecutionContextDefault.hpp 2000/08/14 16:33:58 1.18
+++ XPathExecutionContextDefault.hpp 2000/08/14 22:07:25 1.19
@@ -224,20 +224,7 @@
virtual const NodeRefListBase*
getNodeSetByKey(
- const XalanNode& doc,
- const XalanDOMString& name,
- const XalanDOMString& ref,
- const XalanElement& nscontext);
-
- virtual const NodeRefListBase*
- getNodeSetByKey(
- const XalanNode& doc,
- const XalanDOMString& name,
- const XalanDOMString& ref);
-
- virtual const NodeRefListBase*
- getNodeSetByKey(
- const XalanNode& doc,
+ XalanNode* doc,
const XalanDOMString& name,
const XalanDOMString& ref,
const PrefixResolver& resolver);
