You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xerces.apache.org by tn...@apache.org on 2001/02/26 20:22:21 UTC
cvs commit: xml-xerces/c/src/validators/DTD DTDElementDecl.cpp DTDElementDecl.hpp DTDValidator.cpp DTDValidator.hpp
tng 01/02/26 11:22:20
Modified: c/src/framework XMLElementDecl.cpp XMLElementDecl.hpp
XMLValidator.hpp
c/src/internal XMLScanner.cpp XMLScanner2.cpp
c/src/validators/DTD DTDElementDecl.cpp DTDElementDecl.hpp
DTDValidator.cpp DTDValidator.hpp
Log:
Schema: add parameter prefix in findElem and findAttr.
Revision Changes Path
1.5 +2 -4 xml-xerces/c/src/framework/XMLElementDecl.cpp
Index: XMLElementDecl.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/framework/XMLElementDecl.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- XMLElementDecl.cpp 2000/07/25 22:33:28 1.4
+++ XMLElementDecl.cpp 2001/02/26 19:21:27 1.5
@@ -55,7 +55,7 @@
*/
/**
- * $Id: XMLElementDecl.cpp,v 1.4 2000/07/25 22:33:28 aruna1 Exp $
+ * $Id: XMLElementDecl.cpp,v 1.5 2001/02/26 19:21:27 tng Exp $
*/
@@ -66,7 +66,6 @@
#include <util/XMLUni.hpp>
#include <framework/XMLElementDecl.hpp>
-
// ---------------------------------------------------------------------------
// XMLElementDecl: Public, static data
// ---------------------------------------------------------------------------
@@ -89,9 +88,8 @@
delete [] fFormattedModel;
}
-
// ---------------------------------------------------------------------------
-// ElementDecl: Miscellaneous
+// XMLElementDecl: Miscellaneous
// ---------------------------------------------------------------------------
const XMLCh*
XMLElementDecl::getFormattedContentModel(const XMLValidator& validator) const
1.9 +7 -0 xml-xerces/c/src/framework/XMLElementDecl.hpp
Index: XMLElementDecl.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/framework/XMLElementDecl.hpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- XMLElementDecl.hpp 2000/12/14 18:49:57 1.8
+++ XMLElementDecl.hpp 2001/02/26 19:21:30 1.9
@@ -56,6 +56,9 @@
/*
* $Log: XMLElementDecl.hpp,v $
+ * Revision 1.9 2001/02/26 19:21:30 tng
+ * Schema: add parameter prefix in findElem and findAttr.
+ *
* Revision 1.8 2000/12/14 18:49:57 tng
* Fix API document generation warning: "Warning: end of member group without matching begin"
*
@@ -218,6 +221,9 @@
* @param baseName This is the base part of the name, i.e. after any
* prefix.
*
+ * @param prefix The prefix, if any, of this attribute's name. If
+ * this is empty, then uriID is meaningless as well.
+ *
* @param options Indicates the lookup options.
*
* @param wasAdded Should be set if the attribute is faulted in, else
@@ -228,6 +234,7 @@
const XMLCh* const qName
, const unsigned int uriId
, const XMLCh* const baseName
+ , const XMLCh* const prefix
, const LookupOpts options
, bool& wasAdded
) const = 0;
1.9 +20 -14 xml-xerces/c/src/framework/XMLValidator.hpp
Index: XMLValidator.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/framework/XMLValidator.hpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- XMLValidator.hpp 2000/12/14 18:49:58 1.8
+++ XMLValidator.hpp 2001/02/26 19:21:33 1.9
@@ -1,37 +1,37 @@
/*
* The Apache Software License, Version 1.1
- *
+ *
* Copyright (c) 1999-2000 The Apache Software Foundation. All rights
* reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
- *
+ *
* 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *
+ * notice, this list of conditions and the following disclaimer.
+ *
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the
* distribution.
- *
+ *
* 3. The end-user documentation included with the redistribution,
- * if any, must include the following acknowledgment:
+ * if any, must include the following acknowledgment:
* "This product includes software developed by the
* Apache Software Foundation (http://www.apache.org/)."
* Alternately, this acknowledgment may appear in the software itself,
* if and wherever such third-party acknowledgments normally appear.
- *
+ *
* 4. The names "Xerces" and "Apache Software Foundation" must
* not be used to endorse or promote products derived from this
- * software without prior written permission. For written
+ * software without prior written permission. For written
* permission, please contact apache\@apache.org.
- *
+ *
* 5. Products derived from this software may not be called "Apache",
* nor may "Apache" appear in their name, without prior written
* permission of the Apache Software Foundation.
- *
+ *
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
@@ -45,7 +45,7 @@
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
* ====================================================================
- *
+ *
* This software consists of voluntary contributions made by many
* individuals on behalf of the Apache Software Foundation, and was
* originally based on software copyright (c) 1999, International
@@ -56,6 +56,9 @@
/*
* $Log: XMLValidator.hpp,v $
+ * Revision 1.9 2001/02/26 19:21:33 tng
+ * Schema: add parameter prefix in findElem and findAttr.
+ *
* Revision 1.8 2000/12/14 18:49:58 tng
* Fix API document generation warning: "Warning: end of member group without matching begin"
*
@@ -204,7 +207,7 @@
unsigned int getUnknownNamespaceId() const;
/**
- * The prefix 'xml' is a magic prefix, defined by the XML spec and
+ * The prefix 'xml' is a magic prefix, defined by the XML spec and
* requiring no prior definition. This method returns the id for the
* intrinsically defined URL for this prefix.
*
@@ -356,6 +359,7 @@
(
const unsigned int uriId
, const XMLCh* const baseName
+ , const XMLCh* const prefix
, const XMLCh* const qName
, const LookupOpts options
, bool& wasAdded
@@ -369,6 +373,7 @@
(
const unsigned int uriId
, const XMLCh* const baseName
+ , const XMLCh* const prefix
, const XMLCh* const qName
, const LookupOpts options
, bool& wasAdded
@@ -422,6 +427,7 @@
(
const unsigned int uriId
, const XMLCh* const baseName
+ , const XMLCh* const prefix
, const XMLCh* const qName
) const = 0;
@@ -488,7 +494,7 @@
) const = 0;
virtual const XMLCh* getURIText
- (
+ (
const unsigned int uriId
) const = 0;
1.27 +6 -2 xml-xerces/c/src/internal/XMLScanner.cpp
Index: XMLScanner.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/internal/XMLScanner.cpp,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- XMLScanner.cpp 2001/02/16 17:58:05 1.26
+++ XMLScanner.cpp 2001/02/26 19:21:48 1.27
@@ -55,7 +55,7 @@
*/
/*
- * $Id: XMLScanner.cpp,v 1.26 2001/02/16 17:58:05 tng Exp $
+ * $Id: XMLScanner.cpp,v 1.27 2001/02/26 19:21:48 tng Exp $
*/
@@ -1512,12 +1512,13 @@
(
uriId
, bbName.getBuffer().getRawBuffer()
+ , bbPrefix.getBuffer().getRawBuffer()
, qnameBuf.getRawBuffer()
);
}
else
{
- elemId = fValidator->findElemId(0, 0, qnameBuf.getRawBuffer());
+ elemId = fValidator->findElemId(0, 0, 0, qnameBuf.getRawBuffer());
}
//
@@ -2006,6 +2007,7 @@
(
0
, 0
+ , 0
, fQNameBuf.getRawBuffer()
, XMLValidator::AddIfNotFound
, wasAdded
@@ -2196,6 +2198,7 @@
fAttNameBuf.getRawBuffer()
, 0
, 0
+ , 0
, XMLElementDecl::AddIfNotFound
, wasAdded
);
@@ -2669,6 +2672,7 @@
(
uriId
, fNameBuf.getRawBuffer()
+ , fPrefixBuf.getRawBuffer()
, fQNameBuf.getRawBuffer()
, XMLValidator::AddIfNotFound
, wasAdded
1.20 +7 -6 xml-xerces/c/src/internal/XMLScanner2.cpp
Index: XMLScanner2.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/internal/XMLScanner2.cpp,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- XMLScanner2.cpp 2001/01/15 21:26:33 1.19
+++ XMLScanner2.cpp 2001/02/26 19:21:51 1.20
@@ -55,7 +55,7 @@
*/
/*
- * $Id: XMLScanner2.cpp,v 1.19 2001/01/15 21:26:33 tng Exp $
+ * $Id: XMLScanner2.cpp,v 1.20 2001/02/26 19:21:51 tng Exp $
*/
@@ -218,6 +218,7 @@
curPair->getKey()
, uriId
, suffPtr
+ , prefPtr
, XMLElementDecl::AddIfNotFound
, wasAdded
);
@@ -921,7 +922,7 @@
if (nextCh != chOpenAngle)
return Token_CharData;
- //
+ //
//
// Ok it had to have been a '<' character. So get it out of the reader
// and store the reader number where we saw it, passing it back to the
@@ -1527,7 +1528,7 @@
//
// If this is a close square bracket it could be our closing
- // sequence.
+ // sequence.
//
if (nextCh == chCloseSquare && fReaderMgr.skippedString(CDataClose))
{
@@ -1541,11 +1542,11 @@
, true
);
}
-
+
// And we are done
break;
}
-
+
//
// Make sure its a valid character. But if we've emitted an error
// already, don't bother with the overhead since we've already told
@@ -1632,7 +1633,7 @@
// Try to get another char from the source
- // The code from here on down covers all contengencies,
+ // The code from here on down covers all contengencies,
//
if (!fReaderMgr.getNextCharIfNot(chOpenAngle, nextCh))
{
1.8 +15 -14 xml-xerces/c/src/validators/DTD/DTDElementDecl.cpp
Index: DTDElementDecl.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/validators/DTD/DTDElementDecl.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- DTDElementDecl.cpp 2001/02/16 14:58:55 1.7
+++ DTDElementDecl.cpp 2001/02/26 19:21:59 1.8
@@ -1,37 +1,37 @@
/*
* The Apache Software License, Version 1.1
- *
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ *
+ * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
* reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
- *
+ *
* 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *
+ * notice, this list of conditions and the following disclaimer.
+ *
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the
* distribution.
- *
+ *
* 3. The end-user documentation included with the redistribution,
- * if any, must include the following acknowledgment:
+ * if any, must include the following acknowledgment:
* "This product includes software developed by the
* Apache Software Foundation (http://www.apache.org/)."
* Alternately, this acknowledgment may appear in the software itself,
* if and wherever such third-party acknowledgments normally appear.
- *
+ *
* 4. The names "Xerces" and "Apache Software Foundation" must
* not be used to endorse or promote products derived from this
- * software without prior written permission. For written
+ * software without prior written permission. For written
* permission, please contact apache\@apache.org.
- *
+ *
* 5. Products derived from this software may not be called "Apache",
* nor may "Apache" appear in their name, without prior written
* permission of the Apache Software Foundation.
- *
+ *
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
@@ -45,7 +45,7 @@
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
* ====================================================================
- *
+ *
* This software consists of voluntary contributions made by many
* individuals on behalf of the Apache Software Foundation, and was
* originally based on software copyright (c) 1999, International
@@ -55,7 +55,7 @@
*/
/*
- * $Id: DTDElementDecl.cpp,v 1.7 2001/02/16 14:58:55 tng Exp $
+ * $Id: DTDElementDecl.cpp,v 1.8 2001/02/26 19:21:59 tng Exp $
*/
@@ -96,6 +96,7 @@
XMLAttDef* DTDElementDecl::findAttr(const XMLCh* const qName
, const unsigned int uriId
, const XMLCh* const baseName
+ , const XMLCh* const prefix
, const LookupOpts options
, bool& wasAdded) const
{
1.5 +17 -13 xml-xerces/c/src/validators/DTD/DTDElementDecl.hpp
Index: DTDElementDecl.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/validators/DTD/DTDElementDecl.hpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- DTDElementDecl.hpp 2000/02/24 20:16:49 1.4
+++ DTDElementDecl.hpp 2001/02/26 19:22:02 1.5
@@ -1,37 +1,37 @@
/*
* The Apache Software License, Version 1.1
- *
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ *
+ * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
* reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
- *
+ *
* 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *
+ * notice, this list of conditions and the following disclaimer.
+ *
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the
* distribution.
- *
+ *
* 3. The end-user documentation included with the redistribution,
- * if any, must include the following acknowledgment:
+ * if any, must include the following acknowledgment:
* "This product includes software developed by the
* Apache Software Foundation (http://www.apache.org/)."
* Alternately, this acknowledgment may appear in the software itself,
* if and wherever such third-party acknowledgments normally appear.
- *
+ *
* 4. The names "Xerces" and "Apache Software Foundation" must
* not be used to endorse or promote products derived from this
- * software without prior written permission. For written
+ * software without prior written permission. For written
* permission, please contact apache\@apache.org.
- *
+ *
* 5. Products derived from this software may not be called "Apache",
* nor may "Apache" appear in their name, without prior written
* permission of the Apache Software Foundation.
- *
+ *
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
@@ -45,7 +45,7 @@
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
* ====================================================================
- *
+ *
* This software consists of voluntary contributions made by many
* individuals on behalf of the Apache Software Foundation, and was
* originally based on software copyright (c) 1999, International
@@ -56,6 +56,9 @@
/*
* $Log: DTDElementDecl.hpp,v $
+ * Revision 1.5 2001/02/26 19:22:02 tng
+ * Schema: add parameter prefix in findElem and findAttr.
+ *
* Revision 1.4 2000/02/24 20:16:49 abagchi
* Swat for removing Log from API docs
*
@@ -135,6 +138,7 @@
const XMLCh* const qName
, const unsigned int uriId
, const XMLCh* const baseName
+ , const XMLCh* const prefix
, const LookupOpts options
, bool& wasAdded
) const;
1.14 +21 -18 xml-xerces/c/src/validators/DTD/DTDValidator.cpp
Index: DTDValidator.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/validators/DTD/DTDValidator.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- DTDValidator.cpp 2001/01/15 21:26:34 1.13
+++ DTDValidator.cpp 2001/02/26 19:22:04 1.14
@@ -1,37 +1,37 @@
/*
* The Apache Software License, Version 1.1
- *
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ *
+ * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
* reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
- *
+ *
* 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *
+ * notice, this list of conditions and the following disclaimer.
+ *
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the
* distribution.
- *
+ *
* 3. The end-user documentation included with the redistribution,
- * if any, must include the following acknowledgment:
+ * if any, must include the following acknowledgment:
* "This product includes software developed by the
* Apache Software Foundation (http://www.apache.org/)."
* Alternately, this acknowledgment may appear in the software itself,
* if and wherever such third-party acknowledgments normally appear.
- *
+ *
* 4. The names "Xerces" and "Apache Software Foundation" must
* not be used to endorse or promote products derived from this
- * software without prior written permission. For written
+ * software without prior written permission. For written
* permission, please contact apache\@apache.org.
- *
+ *
* 5. Products derived from this software may not be called "Apache",
* nor may "Apache" appear in their name, without prior written
* permission of the Apache Software Foundation.
- *
+ *
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
@@ -45,7 +45,7 @@
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
* ====================================================================
- *
+ *
* This software consists of voluntary contributions made by many
* individuals on behalf of the Apache Software Foundation, and was
* originally based on software copyright (c) 1999, International
@@ -55,7 +55,7 @@
*/
/*
- * $Id: DTDValidator.cpp,v 1.13 2001/01/15 21:26:34 tng Exp $
+ * $Id: DTDValidator.cpp,v 1.14 2001/02/26 19:22:04 tng Exp $
*/
@@ -164,7 +164,7 @@
, fRootElemId(XMLElementDecl::fgInvalidElemId)
{
//
- // Init all the pool members.
+ // Init all the pool members.
//
// <TBD> Investigate what the optimum values would be for the various
// pools.
@@ -205,8 +205,8 @@
return XMLElementDecl::fgInvalidElemId;
return decl->getId();
}
-
+
// ---------------------------------------------------------------------------
// DTDValidator: Implementation of the XMLValidator interface
// ---------------------------------------------------------------------------
@@ -333,6 +333,7 @@
const XMLElementDecl*
DTDValidator::findElemDecl( const unsigned int uriId
, const XMLCh* const baseName
+ , const XMLCh* const prefix
, const XMLCh* const qName
, const LookupOpts options
, bool& wasAdded) const
@@ -359,6 +360,7 @@
XMLElementDecl*
DTDValidator::findElemDecl( const unsigned int uriId
, const XMLCh* const baseName
+ , const XMLCh* const prefix
, const XMLCh* const qName
, const LookupOpts options
, bool& wasAdded)
@@ -404,6 +406,7 @@
unsigned int
DTDValidator::findElemId(const unsigned int uriId
, const XMLCh* const baseName
+ , const XMLCh* const prefix
, const XMLCh* const qName) const
{
//
@@ -593,7 +596,7 @@
);
// And whether we must check for a first name char
- const bool firstNameChar =
+ const bool firstNameChar =
(
(type == XMLAttDef::ID)
|| (type == XMLAttDef::IDRef)
@@ -872,7 +875,7 @@
, curElem.getFullName()
);
break;
- }
+ }
seenId = true;
}
1.7 +22 -14 xml-xerces/c/src/validators/DTD/DTDValidator.hpp
Index: DTDValidator.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/validators/DTD/DTDValidator.hpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- DTDValidator.hpp 2000/08/09 22:08:48 1.6
+++ DTDValidator.hpp 2001/02/26 19:22:08 1.7
@@ -1,37 +1,37 @@
/*
* The Apache Software License, Version 1.1
- *
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ *
+ * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
* reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
- *
+ *
* 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *
+ * notice, this list of conditions and the following disclaimer.
+ *
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the
* distribution.
- *
+ *
* 3. The end-user documentation included with the redistribution,
- * if any, must include the following acknowledgment:
+ * if any, must include the following acknowledgment:
* "This product includes software developed by the
* Apache Software Foundation (http://www.apache.org/)."
* Alternately, this acknowledgment may appear in the software itself,
* if and wherever such third-party acknowledgments normally appear.
- *
+ *
* 4. The names "Xerces" and "Apache Software Foundation" must
* not be used to endorse or promote products derived from this
- * software without prior written permission. For written
+ * software without prior written permission. For written
* permission, please contact apache\@apache.org.
- *
+ *
* 5. Products derived from this software may not be called "Apache",
* nor may "Apache" appear in their name, without prior written
* permission of the Apache Software Foundation.
- *
+ *
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
@@ -45,7 +45,7 @@
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
* ====================================================================
- *
+ *
* This software consists of voluntary contributions made by many
* individuals on behalf of the Apache Software Foundation, and was
* originally based on software copyright (c) 1999, International
@@ -56,6 +56,9 @@
/*
* $Log: DTDValidator.hpp,v $
+ * Revision 1.7 2001/02/26 19:22:08 tng
+ * Schema: add parameter prefix in findElem and findAttr.
+ *
* Revision 1.6 2000/08/09 22:08:48 jpolast
* added const XMLCh* getURIText() as per XMLValidator.
* allows parsers to use const URIs instead of appending
@@ -193,6 +196,7 @@
(
const unsigned int uriId
, const XMLCh* const baseName
+ , const XMLCh* const prefix
, const XMLCh* const qName
, const LookupOpts options
, bool& wasAdded
@@ -202,6 +206,7 @@
(
const unsigned int uriId
, const XMLCh* const baseName
+ , const XMLCh* const prefix
, const XMLCh* const qName
, const LookupOpts options
, bool& wasAdded
@@ -223,6 +228,7 @@
(
const unsigned int uriId
, const XMLCh* const baseName
+ , const XMLCh* const prefix
, const XMLCh* const qName
) const;
@@ -258,7 +264,7 @@
) const;
virtual const XMLCh* getURIText
- (
+ (
const unsigned int uriId
) const;