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

zim: move regex to globalregex

Browse source
This commit is contained in:
Xiao YiFang 2022-11-19 16:34:31 +08:00
parent 9f6ed1eec2
commit c75c9cc74b
3 changed files with 14 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
base/globalregex.cc
View file

@ -65,3 +65,4 @@ QRegularExpression Mdx::styleElment( "(<style[^>]*>)([\\w\\W]*?)(<\\/style>)",
QRegularExpression::CaseInsensitiveOption);
QRegularExpression Zim::linkSpecialChar("[\\.\\/]");

5
base/globalregex.hh
View file

@ -45,6 +45,11 @@ public:
static QRegularExpression styleElment;
};
class Zim{
public:
static QRegularExpression linkSpecialChar;
};
} // namespace RX
#endif // GLOBALREGEX_HH

15
zim.cc
View file

@ -42,6 +42,7 @@
#include <map>
#include <algorithm>
#include <QtConcurrent>
#include "base/globalregex.hh"
namespace Zim {
@ -883,10 +884,10 @@ string ZimDictionary::convert( const string & in )
}
else{
//tag from list[3]
formatTag = tag;//tag.replace(QRegularExpression("[\\.\\/]"),"-");
formatTag = tag;
}
formatTag.replace(QRegularExpression("[\\.\\/]"),"");
formatTag.replace(RX::Zim::linkSpecialChar,"");
vector< WordArticleLink > links;
links = findArticles( gd::toWString( formatTag ) );
@ -1489,7 +1490,7 @@ void ZimResourceRequest::run()
sptr< Dictionary::DataRequest > ZimDictionary::getResource( string const & name )
{
auto formatedName = QString::fromStdString(name).replace(QRegularExpression("[\\.\\/]"),"");
auto formatedName = QString::fromStdString(name).replace(RX::Zim::linkSpecialChar,"");
return new ZimResourceRequest( *this, formatedName.toStdString() );
}
@ -1641,7 +1642,7 @@ vector< sptr< Dictionary::Class > > makeDictionaries(
}
if( !url.empty() )
{
auto formatedUrl = QString::fromStdString( url ).replace( QRegularExpression( "[\\.\\/]" ), "" );
auto formatedUrl = QString::fromStdString( url ).replace( RX::Zim::linkSpecialChar, "" );
indexedWords.addSingleWord( Utf8::decode( formatedUrl.toStdString() ), n );
}
}
@ -1654,7 +1655,7 @@ vector< sptr< Dictionary::Class > > makeDictionaries(
}
if( !url.empty() )
{
auto formatedUrl = QString::fromStdString( url ).replace( QRegularExpression( "[\\.\\/]" ), "" );
auto formatedUrl = QString::fromStdString( url ).replace( RX::Zim::linkSpecialChar, "" );
indexedWords.addWord( Utf8::decode( formatedUrl.toStdString() ), n );
}
}
@ -1662,7 +1663,7 @@ vector< sptr< Dictionary::Class > > makeDictionaries(
}
else
{
auto formatedUrl = QString::fromStdString(url).replace(QRegularExpression("[\\.\\/]"),"");
auto formatedUrl = QString::fromStdString(url).replace(RX::Zim::linkSpecialChar,"");
indexedResources.addSingleWord( Utf8::decode( formatedUrl.toStdString() ), n );
}
}
@ -1701,7 +1702,7 @@ vector< sptr< Dictionary::Class > > makeDictionaries(
{
// url.insert( url.begin(), '/' );
// url.insert( url.begin(), nameSpace );
auto formatedUrl = QString::fromStdString(url).replace(QRegularExpression("[\\.\\/]"),"");
auto formatedUrl = QString::fromStdString(url).replace(RX::Zim::linkSpecialChar,"");
indexedResources.addSingleWord( Utf8::decode( formatedUrl.toStdString() ), n );
}
}