dbertoni 02/05/14 08:43:26 Modified: c/src/XalanSourceTree XalanSourceTreeParserLiaison.cpp XalanSourceTreeParserLiaison.hpp Log: Set validation to dynamic, instead of always. Revision Changes Path 1.28 +71 -4 xml-xalan/c/src/XalanSourceTree/XalanSourceTreeParserLiaison.cpp Index: XalanSourceTreeParserLiaison.cpp =================================================================== RCS file: /home/cvs/xml-xalan/c/src/XalanSourceTree/XalanSourceTreeParserLiaison.cpp,v retrieving revision 1.27 retrieving revision 1.28 diff -u -r1.27 -r1.28 --- XalanSourceTreeParserLiaison.cpp 6 Apr 2002 19:36:51 -0000 1.27 +++ XalanSourceTreeParserLiaison.cpp 14 May 2002 15:43:26 -0000 1.28 @@ -2,7 +2,7 @@ * The Apache Software License, Version 1.1 * * - * Copyright (c) 1999-2001 The Apache Software Foundation. All rights + * Copyright (c) 1999-2002 The Apache Software Foundation. All rights * reserved. * * Redistribution and use in source and binary forms, with or without @@ -127,6 +127,62 @@ +// http://apache.org/xml/features/validation/dynamic +const XalanDOMChar XalanSourceTreeParserLiaison::dynamicValidationString[] = { + XalanUnicode::charLetter_h, + XalanUnicode::charLetter_t, + XalanUnicode::charLetter_t, + XalanUnicode::charLetter_p, + XalanUnicode::charColon, + XalanUnicode::charSolidus, + XalanUnicode::charSolidus, + XalanUnicode::charLetter_a, + XalanUnicode::charLetter_p, + XalanUnicode::charLetter_a, + XalanUnicode::charLetter_c, + XalanUnicode::charLetter_h, + XalanUnicode::charLetter_e, + XalanUnicode::charFullStop, + XalanUnicode::charLetter_o, + XalanUnicode::charLetter_r, + XalanUnicode::charLetter_g, + XalanUnicode::charSolidus, + XalanUnicode::charLetter_x, + XalanUnicode::charLetter_m, + XalanUnicode::charLetter_l, + XalanUnicode::charSolidus, + XalanUnicode::charLetter_f, + XalanUnicode::charLetter_e, + XalanUnicode::charLetter_a, + XalanUnicode::charLetter_t, + XalanUnicode::charLetter_u, + XalanUnicode::charLetter_r, + XalanUnicode::charLetter_e, + XalanUnicode::charLetter_s, + XalanUnicode::charSolidus, + XalanUnicode::charLetter_v, + XalanUnicode::charLetter_a, + XalanUnicode::charLetter_l, + XalanUnicode::charLetter_i, + XalanUnicode::charLetter_d, + XalanUnicode::charLetter_a, + XalanUnicode::charLetter_t, + XalanUnicode::charLetter_i, + XalanUnicode::charLetter_o, + XalanUnicode::charLetter_n, + XalanUnicode::charSolidus, + XalanUnicode::charLetter_d, + XalanUnicode::charLetter_y, + XalanUnicode::charLetter_n, + XalanUnicode::charLetter_a, + XalanUnicode::charLetter_m, + XalanUnicode::charLetter_i, + XalanUnicode::charLetter_c, + 0 +}; + + + // http://xml.org/sax/features/namespaces const XalanDOMChar XalanSourceTreeParserLiaison::namespacesString[] = { XalanUnicode::charLetter_h, @@ -319,9 +375,20 @@ XalanAutoPtr<SAX2XMLReader> theReader(XMLReaderFactory::createXMLReader()); - theReader->setFeature( - validationString, - m_xercesParserLiaison.getUseValidation()); + const bool fValidate = m_xercesParserLiaison.getUseValidation(); + + if (fValidate == false) + { + theReader->setFeature( + validationString, + false); + } + else + { + theReader->setFeature( + dynamicValidationString, + true); + } theReader->setFeature( namespacesString, 1.18 +3 -1 xml-xalan/c/src/XalanSourceTree/XalanSourceTreeParserLiaison.hpp Index: XalanSourceTreeParserLiaison.hpp =================================================================== RCS file: /home/cvs/xml-xalan/c/src/XalanSourceTree/XalanSourceTreeParserLiaison.hpp,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- XalanSourceTreeParserLiaison.hpp 6 Apr 2002 19:36:51 -0000 1.17 +++ XalanSourceTreeParserLiaison.hpp 14 May 2002 15:43:26 -0000 1.18 @@ -2,7 +2,7 @@ * The Apache Software License, Version 1.1 * * - * Copyright (c) 1999-2001 The Apache Software Foundation. All rights + * Copyright (c) 1999-2002 The Apache Software Foundation. All rights * reserved. * * Redistribution and use in source and binary forms, with or without @@ -369,6 +369,8 @@ bool m_poolAllText; static const XalanDOMChar validationString[]; + + static const XalanDOMChar dynamicValidationString[]; static const XalanDOMChar namespacesString[];
--------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]