Add W3C XML Schema validation support

This was done by Tobias Koenig, as part of an internship at Trolltech/Qt
Software, started at Wed Oct 1 18:32:43 2008 +0200, and the last commit being
part of this commit dating Tue Feb 24 11:03:36 2009 +0100. This is work
consisting of about 650 commits squashed into one, where the first commit was
61b280386c1905a15690fdd917dcbc8eb09b6283, in the repository before Qt's history
cut.

1 files changed, 10 insertions, 17 deletions

diff --git a/src/xmlpatterns/expr/qexpressionfactory.cpp b/src/xmlpatterns/expr/qexpressionfactory.cpp
index ec86be0..b41b0de 100644
--- a/src/xmlpatterns/expr/qexpressionfactory.cpp
+++ b/src/xmlpatterns/expr/qexpressionfactory.cpp
@@ -81,9 +81,13 @@ Expression::Ptr ExpressionFactory::createExpression(const QString &expr,
                                                     const QUrl &queryURI,
                                                     const QXmlName &initialTemplateName)
 {
-    if(lang == QXmlQuery::XQuery10)
+    if(lang == QXmlQuery::XSLT20)
     {
-        return createExpression(Tokenizer::Ptr(new XQueryTokenizer(expr, queryURI)),
+        QByteArray query(expr.toUtf8());
+        QBuffer buffer(&query);
+        buffer.open(QIODevice::ReadOnly);
+
+        return createExpression(&buffer,
                                 context,
                                 lang,
                                 requiredType,
@@ -92,12 +96,7 @@ Expression::Ptr ExpressionFactory::createExpression(const QString &expr,
     }
     else
     {
-        Q_ASSERT(lang == QXmlQuery::XSLT20);
-        QByteArray query(expr.toUtf8());
-        QBuffer buffer(&query);
-        buffer.open(QIODevice::ReadOnly);
-
-        return createExpression(&buffer,
+        return createExpression(Tokenizer::Ptr(new XQueryTokenizer(expr, queryURI)),
                                 context,
                                 lang,
                                 requiredType,
@@ -118,16 +117,10 @@ Expression::Ptr ExpressionFactory::createExpression(QIODevice *const device,
 
     Tokenizer::Ptr tokenizer;
 
-    if(lang == QXmlQuery::XQuery10)
-    {
-
-        tokenizer = Tokenizer::Ptr(new XQueryTokenizer(QString::fromUtf8(device->readAll()), queryURI));
-    }
-    else
-    {
-        Q_ASSERT(lang == QXmlQuery::XSLT20);
+    if(lang == QXmlQuery::XSLT20)
         tokenizer = Tokenizer::Ptr(new XSLTTokenizer(device, queryURI, context, context->namePool()));
-    }
+    else
+        tokenizer = Tokenizer::Ptr(new XQueryTokenizer(QString::fromUtf8(device->readAll()), queryURI));
 
     return createExpression(tokenizer, context, lang, requiredType, queryURI, initialTemplateName);
 }