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

opt: dsl target url

Browse source
This commit is contained in:
YiFang Xiao 2023-07-01 10:56:48 +08:00
parent c16a2da241
commit e971d2be67
1 changed files with 24 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
src/dict/dsl.cc
View file

@ -260,6 +260,7 @@ private:
// Parts of dslToHtml()
string nodeToHtml( ArticleDom::Node const & );
string processNodeChildren( ArticleDom::Node const & node );
string getNodeLink( ArticleDom::Node const & node );
bool hasHiddenZones() /// Return true if article has hidden zones
{ return optionalPartNom != 0; }
@ -752,6 +753,25 @@ string DslDictionary::processNodeChildren( ArticleDom::Node const & node )
return result;
}
string DslDictionary::getNodeLink( ArticleDom::Node const & node )
{
string link;
if ( !node.tagAttrs.empty() ) {
QString attrs = QString::fromStdU32String( node.tagAttrs );
int n = attrs.indexOf( "target=\"" );
if ( n >= 0 ) {
int n_end = attrs.indexOf( '\"', n + 8 );
QString target = attrs.mid( n + 8, n_end > n + 8 ? n_end - ( n + 8 ) : -1 );
link = Html::escape( Filetype::simplifyString( string( target.toUtf8().data() ), false ) );
}
}
if ( link.empty() )
link = Html::escape( Filetype::simplifyString( Utf8::encode( node.renderAsText() ), false ) );
return link;
}
string DslDictionary::nodeToHtml( ArticleDom::Node const & node )
{
string result;
@ -958,7 +978,7 @@ string DslDictionary::nodeToHtml( ArticleDom::Node const & node )
}
else if( node.tagName == U"url" )
{
string link = Html::escape( Filetype::simplifyString( Utf8::encode( node.renderAsText() ), false ) );
string link = getNodeLink( node );
if ( QUrl::fromEncoded( link.c_str() ).scheme().isEmpty() )
link = "http://" + link;
@ -1051,7 +1071,8 @@ string DslDictionary::nodeToHtml( ArticleDom::Node const & node )
url.setScheme( "gdlookup" );
url.setHost( "localhost" );
wstring nodeStr = node.renderAsText();
auto nodeStr = Utf8::decode( getNodeLink( node ) );
normalizeHeadword( nodeStr );
url.setPath( Utils::Url::ensureLeadingSlash( QString::fromStdU32String( nodeStr ) ) );
if( !node.tagAttrs.empty() )