dbertoni 01/12/19 14:06:51
Modified: c/src/XSLT KeyDeclaration.hpp KeyTable.cpp KeyTable.hpp
Log:
Names of keys should be QNames.
Revision Changes Path
1.8 +14 -14 xml-xalan/c/src/XSLT/KeyDeclaration.hpp
Index: KeyDeclaration.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/KeyDeclaration.hpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- KeyDeclaration.hpp 2000/08/22 20:21:23 1.7
+++ KeyDeclaration.hpp 2001/12/19 22:06:51 1.8
@@ -64,7 +64,7 @@
-#include <XalanDOM/XalanDOMString.hpp>
+#include <XPath/XalanQNameByValue.hpp>
@@ -82,15 +82,15 @@
/**
* Construct an object containing attributes of an "xsl:key" element
*
- * @param name name of element
+ * @param qname name of element
* @param matchPattern XPath for "match" attribute
* @paramuse XPath for "use" attribute
*/
KeyDeclaration(
- const XalanDOMString& name,
- const XPath& matchPattern,
- const XPath& use) :
- m_name(name),
+ const XalanQName& qname,
+ const XPath& matchPattern,
+ const XPath& use) :
+ m_qname(qname),
m_match(&matchPattern),
m_use(&use)
{
@@ -98,14 +98,14 @@
explicit
KeyDeclaration() :
- m_name(),
+ m_qname(),
m_match(0),
m_use(0)
{
}
KeyDeclaration(const KeyDeclaration& theSource) :
- m_name(theSource.m_name),
+ m_qname(theSource.m_qname),
m_match(theSource.m_match),
m_use(theSource.m_use)
{
@@ -120,10 +120,10 @@
*
* @return name string
*/
- const XalanDOMString&
- getName() const
+ const XalanQName&
+ getQName() const
{
- return m_name;
+ return m_qname;
}
/**
@@ -150,11 +150,11 @@
private:
- XalanDOMString m_name;
+ XalanQNameByValue m_qname;
- const XPath* m_match;
+ const XPath* m_match;
- const XPath* m_use;
+ const XPath* m_use;
};
1.18 +4 -4 xml-xalan/c/src/XSLT/KeyTable.cpp
Index: KeyTable.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/KeyTable.cpp,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- KeyTable.cpp 2001/09/26 21:30:23 1.17
+++ KeyTable.cpp 2001/12/19 22:06:51 1.18
@@ -217,10 +217,10 @@
const NodeRefListBase&
KeyTable::getNodeSetByKey(
- const XalanDOMString& name,
+ const XalanQName&
qname,
const XalanDOMString& ref)
const
{
- const KeysMapType::const_iterator i = m_keys.find(name);
+ const KeysMapType::const_iterator i = m_keys.find(qname);
if (i != m_keys.end())
{
@@ -272,7 +272,7 @@
if(xuse->getType() != XObject::eTypeNodeSet)
{
addIfNotFound(
- theKeys[kd.getName()][xuse->str()],
+ theKeys[kd.getQName()][xuse->str()],
testNode);
}
else
@@ -298,7 +298,7 @@
DOMServices::getNodeData(*nl.item(i), nodeData);
addIfNotFound(
- theKeys[kd.getName()][nodeData],
+ theKeys[kd.getQName()][nodeData],
testNode);
clear(nodeData);
1.11 +5 -4 xml-xalan/c/src/XSLT/KeyTable.hpp
Index: KeyTable.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/KeyTable.hpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- KeyTable.hpp 2000/12/04 20:48:35 1.10
+++ KeyTable.hpp 2001/12/19 22:06:51 1.11
@@ -58,7 +58,7 @@
#define XALAN_KEYTABLE_HEADER_GUARD
/**
- * $Id: KeyTable.hpp,v 1.10 2000/12/04 20:48:35 dbertoni Exp $
+ * $Id: KeyTable.hpp,v 1.11 2001/12/19 22:06:51 dbertoni Exp $
*
* $State: Exp $
*
@@ -82,6 +82,7 @@
#include <XPath/MutableNodeRefList.hpp>
+#include <XPath/XalanQNameByReference.hpp>
@@ -112,7 +113,7 @@
MutableNodeRefList,
less<XalanDOMString> > NodeListMapType;
- typedef map<XalanDOMString,
+ typedef map<XalanQNameByReference,
NodeListMapType,
less<XalanDOMString> > KeysMapType;
#else
@@ -121,7 +122,7 @@
typedef std::map<XalanDOMString,
MutableNodeRefList> NodeListMapType;
- typedef std::map<XalanDOMString,
+ typedef std::map<XalanQNameByReference,
NodeListMapType>
KeysMapType;
#endif
@@ -161,7 +162,7 @@
*/
const NodeRefListBase&
getNodeSetByKey(
- const XalanDOMString& name,
+ const XalanQName& qname,
const XalanDOMString& ref) const;
/**
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
