Merge branch 'master' of ssh://drop.maemo.org/git/mdictionary

Conflicts:
	trunk/src/plugins/xdxf/tests/test.cpp
	trunk/src/plugins/xdxf/tests/test.h

diff --cc trunk/src/includes/CommonDictInterface.h
Simple merge

diff --cc trunk/src/plugins/xdxf/src/xdxfplugin.cpp
Simple merge

diff --cc trunk/src/plugins/xdxf/tests/test.cpp
index cb6c8c5,dffbbe9..db858b2
--- 1/trunk/src/plugins/xdxf/tests/test.cpp
--- 2/trunk/src/plugins/xdxf/tests/test.cpp
+++ b/trunk/src/plugins/xdxf/tests/test.cpp
@@@ -275,23 -319,47 +319,64 @@@ void XdxfTest::timeCacheNormalize() 
      File.close();
  }
  
 +void XdxfTest::removeAccents()
 +{
 +    XdxfPluginSub xdxf;
 +    xdxf.settings()->setValue(QString("strip_accents"), QString("true"));
 +    QCOMPARE(xdxf.getRemoveAccents(QString::fromUtf8("nóżka")), QString("nozka"));
 +    QCOMPARE(xdxf.getRemoveAccents(QString::fromUtf8("motor")), QString("motor"));
 +    QCOMPARE(xdxf.getRemoveAccents(QString::fromUtf8("nÓżKa")), QString("nozka"));
 +    QCOMPARE(xdxf.getRemoveAccents(QString::fromUtf8("ławka")), QString("lawka"));
 +    QCOMPARE(xdxf.getRemoveAccents(QString::fromUtf8("éàèùâêîôûëïüÿäöüç")), QString("eaeuaeioueiuyaouc"));
 +    QCOMPARE(xdxf.getRemoveAccents(QString::fromUtf8("íőűúó")), QString("iouuo"));
 +    QCOMPARE(xdxf.getRemoveAccents(QString::fromUtf8("-ę")), QString("-e"));
 +    QCOMPARE(xdxf.getRemoveAccents(QString::fromUtf8("\"e\"")), QString("\"e\""));
 +    QCOMPARE(xdxf.getRemoveAccents(QString::fromUtf8("'e'")), QString("'e'"));
 +    QCOMPARE(xdxf.getRemoveAccents(QString::fromUtf8("\\e")), QString("e"));
 +    QCOMPARE(xdxf.getRemoveAccents(QString::fromUtf8("\\")), QString(""));
 +}
 +
+ void XdxfTest::timeFileNormalize(){
+     QTime timer;
+     QDate date;
+     QFile File("../tests/time.xml");
+     if(!File.open(QFile::ReadWrite | QFile::Text)) {
+         qDebug()<<"Error: could not open file";
+         return;
+     }
+     QTextStream out(&File);
+     while(!out.atEnd())
+         out.seek(out.pos()+1);
+ 
+     XdxfPlugin xdxfPluginB(this);
+     Settings *settings=new Settings;
+     settings->setValue("path","../../../../../../dict.xdxf");
+     settings->setValue("strip_accents", "true");
+     CommonDictInterface *xdxfPlugin = xdxfPluginB.getNew(settings);
+ 
+     timer.start();
+     xdxfPlugin->search("Bantu");
+     out<<"\n<type> SearchFile-begin with strip accent </type> <time>" << timer.elapsed();
+     out << "</time>";
+ 
+     timer.start();
+     xdxfPlugin->search("level");
+     out<<"\n<type> SearchFile-midle with strip accent </type> <time>" << timer.elapsed();
+     out << "</time>";
+ 
+     timer.start();
+     xdxfPlugin->search("zoril");
+     out<<"\n<type> SearchFile-end with strip accent </type> <time>" << timer.elapsed();
+     out << "</time>";
+ 
+     timer.start();
+     xdxfPlugin->searchWordList("level");
+     out<<"\n<type> SearchWordListFile with strip accent </type> <time>" << timer.elapsed();
+     out<< "</time>\n";
+ 
+     File.close();
+ 
+ }
  
  QTEST_MAIN(XdxfTest)
  //#include "testqstring.moc"

diff --cc trunk/src/plugins/xdxf/tests/test.h
index 7a1f43b,f4fed84..a88d6a7
--- 1/trunk/src/plugins/xdxf/tests/test.h
--- 2/trunk/src/plugins/xdxf/tests/test.h
+++ b/trunk/src/plugins/xdxf/tests/test.h
@@@ -49,17 -49,8 +49,19 @@@
       void searchWordListCache();
       void timeCache();
       void timeFile();
 +     void removeAccents();
 + };
 +
 + class XdxfPluginSub : public XdxfPlugin
 + {
 +    public:
 +     XdxfPluginSub(QObject *parent = 0) : XdxfPlugin(parent){}
 +     QString getRemoveAccents(QString s)
 +     {
 +         return removeAccents(s);
 +     }
+      void timeCacheNormalize();
+      void timeFileNormalize();
   };