hashirama/goldendict-ng
hashirama/goldendict-ng
0
0
Fork 0
mirror of https://github.com/xiaoyifang/goldendict-ng.git synced 2024-11-27 15:24:05 +00:00
Code Issues Actions 1 Projects Releases Wiki Activity

Merge pull request #812 from shenlebantongying/fix_stardict

Browse source 
Fix: stardict's xdxf resources failed to convert because Qt6's QDomDocument is stricter
This commit is contained in:
xiaoyifang 2023-06-05 00:03:23 +08:00 committed by GitHub
parent 87358f73c6 b06c01beeb
commit b149b211fe
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 20 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
src/dict/xdxf2html.cc
View file

@ -97,7 +97,7 @@ string convert( string const & in, DICT_TYPE type, map < string, string > const
if ( afterEol ) if ( afterEol )
{ {
if( !isLogicalFormat ) if( !isLogicalFormat )
inConverted.append( "&nbsp;" ); inConverted.append( "&#160;" ); // xml don't have &nbsp;
break; break;
} }
// Fall-through // Fall-through
@ -126,13 +126,27 @@ string convert( string const & in, DICT_TYPE type, map < string, string > const
in_data = "<div class=\"sdct_x\">"; in_data = "<div class=\"sdct_x\">";
in_data += inConverted + "</div>"; in_data += inConverted + "</div>";
if( !dd.setContent( QByteArray( in_data.c_str() ), false, &errorStr, &errorLine, &errorColumn ) )
{
qWarning( "Xdxf2html error, xml parse failed: %s at %d,%d\n", errorStr.toLocal8Bit().constData(), errorLine, errorColumn );
gdWarning( "The input was: %s\n", in.c_str() );
return in; #if ( QT_VERSION < QT_VERSION_CHECK( 6, 0, 0 ) )
if ( !dd.setContent( QByteArray( in_data.c_str() ), false, &errorStr, &errorLine, &errorColumn ) ) {
qWarning( "Xdxf2html error, xml parse failed: %s at %d,%d\n",
errorStr.toLocal8Bit().constData(),
errorLine,
errorColumn );
gdWarning( "The input was: %s\n", in_data.c_str() );
return in;
} }
#else
auto setContentResult = dd.setContent( QByteArray::fromStdString( in_data ) );
if ( !setContentResult ) {
qWarning( "Xdxf2html error, xml parse failed: %s at %d,%d\n",
setContentResult.errorMessage.toStdString().c_str(),
setContentResult.errorLine,
setContentResult.errorColumn );
gdWarning( "The input was: %s\n", in_data.c_str() );
return in;
}
#endif
QDomNodeList nodes = dd.elementsByTagName( "ex" ); // Example QDomNodeList nodes = dd.elementsByTagName( "ex" ); // Example