fix a bug in xdxfPlugin

diff --git a/trunk/src/plugins/xdxf/src/xdxfplugin.cpp b/trunk/src/plugins/xdxf/src/xdxfplugin.cpp
index 85379c6..bb7929c 100644 (file)
--- a/trunk/src/plugins/xdxf/src/xdxfplugin.cpp
+++ b/trunk/src/plugins/xdxf/src/xdxfplugin.cpp
@@ -213,11 +213,22 @@ QString XdxfPlugin::searchFile(QString key) {
         else if(dictionaryReader.tokenType() == QXmlStreamReader::Characters) {
             if(match) {
                 QString temp(dictionaryReader.text().toString());
+                if(temp=="\n")
+                    temp=dictionaryReader.readElementText();
                 temp.replace("\n","");
                 if(temp == ""){
+                    int i=0;
                     while(dictionaryReader.name()!="ar"&&
                                 !dictionaryReader.atEnd()){
                         dictionaryReader.readNext();
+                        if(dictionaryReader.name()!="" && dictionaryReader.name()!="ar") {
+                            if(i%2)
+                                temp+=tr("</");
+                            else
+                                temp+=tr("<");
+                            temp=temp+dictionaryReader.name().toString() + tr(">");
+                            i++;
+                        }
                         temp+=dictionaryReader.text().toString();
                     }
                 }

diff --git a/trunk/src/plugins/xdxf/tests/dict.xdxf b/trunk/src/plugins/xdxf/tests/dict.xdxf
index d217c26..06a1952 100644 (file)
--- a/trunk/src/plugins/xdxf/tests/dict.xdxf
+++ b/trunk/src/plugins/xdxf/tests/dict.xdxf
@@ -19,4 +19,6 @@ sto</ar>
 tysišc</ar>
 <ar><k>house</k>
 dom</ar>
+<ar><k>test</k>
+<opt>krowa</opt>test01</ar>
 </xdxf>

diff --git a/trunk/src/plugins/xdxf/tests/test.cpp b/trunk/src/plugins/xdxf/tests/test.cpp
index b06adf7..f3fd301 100644 (file)
--- a/trunk/src/plugins/xdxf/tests/test.cpp
+++ b/trunk/src/plugins/xdxf/tests/test.cpp
@@ -45,6 +45,8 @@ void XdxfTest::search() {
     xdxfPlugin->search("wino");
     QCOMPARE(xdxfPlugin->search("."), QString("kropka\n"));
     QCOMPARE(xdxfPlugin->search("1"), QString("one\n"));
+
+    QCOMPARE(xdxfPlugin->search("test"), QString("test1\n"));
 }
 
 void XdxfTest::searchWordList() {
@@ -56,7 +58,7 @@ void XdxfTest::searchWordList() {
     CommonDictInterface *xdxfPlugin = xdxfPluginB.getNew(settings);
     QList<Translation*> te = xdxfPlugin->searchWordList(".", 10);
     if(te.size()>0)
-        QCOMPARE(te.size(), 8);
+        QCOMPARE(te.size(), 9);
     QList<Translation*> te2 = xdxfPlugin->searchWordList("1",10);
     QCOMPARE(te2.size(), 5);
 
@@ -67,7 +69,7 @@ void XdxfTest::searchWordList() {
         QCOMPARE(te4.at(0)->key(), QString("house"));
 
     QList<Translation*> te5 = xdxfPlugin->searchWordList("*");
-        QCOMPARE(te5.size(), 8);
+        QCOMPARE(te5.size(), 9);
 
     QList<Translation*> te6 = xdxfPlugin->searchWordList("*", 8);
         QCOMPARE(te6.size(), 8);
@@ -103,7 +105,7 @@ void XdxfTest::stop() {
     QFuture<QList<Translation*> > future = QtConcurrent::run(xdxfPlugin, &CommonDictInterface::searchWordList, string, 10);
     QList<Translation*> te5 = future.result();
 
-    QCOMPARE(te5.size(), 8);
+    QCOMPARE(te5.size(), 9);
 }