palo/valentina
1
0
Fork 0
mirror of https://gitlab.com/smart-pattern/valentina.git synced 2024-07-03 09:38:11 +02:00
Code Issues Projects Releases Wiki Activity

Reading from disc doesn't work from on Windows. Read from memory instead.

Browse source
This commit is contained in:
Roman Telezhynskyi 2023-03-04 09:17:31 +02:00
parent 08362980bd
commit a791fc0173
2 changed files with 76 additions and 74 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
src/libs/ifc/xml/vabstractconverter.cpp
View file

@ -31,6 +31,7 @@
#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) #if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
#include <xercesc/parsers/XercesDOMParser.hpp> #include <xercesc/parsers/XercesDOMParser.hpp>
#include <xercesc/framework/MemBufInputSource.hpp>
#else #else
#include <QXmlSchema> #include <QXmlSchema>
#include <QXmlSchemaValidator> #include <QXmlSchemaValidator>
@ -180,21 +181,18 @@ void VAbstractConverter::ValidateXML(const QString &schema) const
VParserErrorHandler parserErrorHandler; VParserErrorHandler parserErrorHandler;
#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) #if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
QScopedPointer<QTemporaryFile> tempSchema(QTemporaryFile::createNativeFile(fileSchema));
if (tempSchema == nullptr)
{
const QString errorMsg(tr("Can't create native file for schema file %1:\n%2.")
.arg(schema, fileSchema.errorString()));
throw VException(errorMsg);
}
if (tempSchema->open())
{
XERCES_CPP_NAMESPACE::XercesDOMParser domParser; XERCES_CPP_NAMESPACE::XercesDOMParser domParser;
domParser.setErrorHandler(&parserErrorHandler); domParser.setErrorHandler(&parserErrorHandler);
QByteArray data = fileSchema.readAll();
const char* schemaData = data.constData();
QScopedPointer<XERCES_CPP_NAMESPACE::InputSource> grammarSource(
new XERCES_CPP_NAMESPACE::MemBufInputSource(reinterpret_cast<const XMLByte*>(schemaData),
strlen(schemaData), "schema"));
if (domParser.loadGrammar( if (domParser.loadGrammar(
tempSchema->fileName().toUtf8().constData(), *grammarSource,
XERCES_CPP_NAMESPACE::Grammar::SchemaGrammarType, true) == nullptr) XERCES_CPP_NAMESPACE::Grammar::SchemaGrammarType, true) == nullptr)
{ {
VException e(parserErrorHandler.StatusMessage()); VException e(parserErrorHandler.StatusMessage());
@ -219,7 +217,21 @@ void VAbstractConverter::ValidateXML(const QString &schema) const
domParser.setValidationSchemaFullChecking(true); domParser.setValidationSchemaFullChecking(true);
domParser.useCachedGrammarInParse(true); domParser.useCachedGrammarInParse(true);
domParser.parse(m_convertedFileName.toUtf8().constData()); QFile pattern(m_convertedFileName);
if (not pattern.open(QIODevice::ReadOnly))
{
const QString errorMsg(tr("Can't open file %1:\n%2.").arg(m_convertedFileName, pattern.errorString()));
throw VException(errorMsg);
}
QByteArray patternFileData = pattern.readAll();
const char* patternData = patternFileData.constData();
QScopedPointer<XERCES_CPP_NAMESPACE::InputSource> patternSource(
new XERCES_CPP_NAMESPACE::MemBufInputSource(reinterpret_cast<const XMLByte*>(patternData),
strlen(patternData), "pattern"));
domParser.parse(*patternSource);
if (domParser.getErrorCount() > 0) if (domParser.getErrorCount() > 0)
{ {
@ -228,11 +240,6 @@ void VAbstractConverter::ValidateXML(const QString &schema) const
.arg(parserErrorHandler.Column()).arg(m_originalFileName)); .arg(parserErrorHandler.Column()).arg(m_originalFileName));
throw e; throw e;
} }
}
else
{
qCritical() << tr("Unable to open native file for schema");
}
#else #else
QFile pattern(m_convertedFileName); QFile pattern(m_convertedFileName);
if (not pattern.open(QIODevice::ReadOnly)) if (not pattern.open(QIODevice::ReadOnly))

25
src/test/ValentinaTest/tst_xsdschema.cpp
View file

@ -39,6 +39,7 @@
#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) #if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
#include <xercesc/parsers/XercesDOMParser.hpp> #include <xercesc/parsers/XercesDOMParser.hpp>
#include <xercesc/framework/MemBufInputSource.hpp>
#include <QMap> #include <QMap>
#else #else
@ -48,6 +49,7 @@
namespace namespace
{ {
//--------------------------------------------------------------------------------------------------------------------- //---------------------------------------------------------------------------------------------------------------------
void ValidateSchema(const QString &schema) void ValidateSchema(const QString &schema)
{ {
@ -60,20 +62,18 @@ void ValidateSchema(const QString &schema)
VParserErrorHandler parserErrorHandler; VParserErrorHandler parserErrorHandler;
#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) #if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
QScopedPointer<QTemporaryFile> tempSchema(QTemporaryFile::createNativeFile(fileSchema));
if (tempSchema == nullptr)
{
QFAIL(qUtf8Printable(QStringLiteral("Can't create native file for schema file %1:\n%2.")
.arg(schema, fileSchema.errorString())));
}
if (tempSchema->open())
{
XERCES_CPP_NAMESPACE::XercesDOMParser domParser; XERCES_CPP_NAMESPACE::XercesDOMParser domParser;
domParser.setErrorHandler(&parserErrorHandler); domParser.setErrorHandler(&parserErrorHandler);
QByteArray data = fileSchema.readAll();
const char* schemaData = data.constData();
QScopedPointer<XERCES_CPP_NAMESPACE::InputSource> grammarSource(
new XERCES_CPP_NAMESPACE::MemBufInputSource(reinterpret_cast<const XMLByte*>(schemaData),
strlen(schemaData), "schema"));
if (domParser.loadGrammar( if (domParser.loadGrammar(
tempSchema->fileName().toUtf8().constData(), *grammarSource,
XERCES_CPP_NAMESPACE::Grammar::SchemaGrammarType, true) == nullptr) XERCES_CPP_NAMESPACE::Grammar::SchemaGrammarType, true) == nullptr)
{ {
QFAIL(qUtf8Printable(QStringLiteral("%1 Could not load schema file '%2'.") QFAIL(qUtf8Printable(QStringLiteral("%1 Could not load schema file '%2'.")
@ -85,11 +85,6 @@ void ValidateSchema(const QString &schema)
.arg(parserErrorHandler.StatusMessage(), fileSchema.fileName()) .arg(parserErrorHandler.StatusMessage(), fileSchema.fileName())
.arg(parserErrorHandler.Line()) .arg(parserErrorHandler.Line())
.arg(parserErrorHandler.Column()))); .arg(parserErrorHandler.Column())));
}
else
{
QFAIL("Unable to open native file for schema");
}
#else #else
QXmlSchema sch; QXmlSchema sch;
sch.setMessageHandler(&parserErrorHandler); sch.setMessageHandler(&parserErrorHandler);