fix a bug in xdxfplugin (in makeCache)

diff --git a/trunk/src/plugins/xdxf/src/xdxfplugin.cpp b/trunk/src/plugins/xdxf/src/xdxfplugin.cpp
index bb7929c..03b0460 100644 (file)
--- a/trunk/src/plugins/xdxf/src/xdxfplugin.cpp
+++ b/trunk/src/plugins/xdxf/src/xdxfplugin.cpp
@@ -463,9 +463,18 @@ bool XdxfPlugin::makeCache(QString dir) {
                 QString temp(reader.text().toString());
                 temp.replace("\n","");
                 if(temp == ""){
+                    int i=0;
                     while(reader.name()!="ar"&&
                                 !reader.atEnd()){
                         reader.readNext();
+                        if(reader.name()!="" && reader.name()!="ar") {
+                            if(i%2)
+                                temp+=tr("</");
+                            else
+                                temp+=tr("<");
+                            temp=temp+reader.name().toString() + tr(">");
+                            i++;
+                        }
                         temp+=reader.text().toString();
                     }
                 }

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

diff --git a/trunk/src/plugins/xdxf/tests/test.cpp b/trunk/src/plugins/xdxf/tests/test.cpp
index f3fd301..0d37013 100644 (file)
--- a/trunk/src/plugins/xdxf/tests/test.cpp
+++ b/trunk/src/plugins/xdxf/tests/test.cpp
@@ -46,7 +46,7 @@ void XdxfTest::search() {
     QCOMPARE(xdxfPlugin->search("."), QString("kropka\n"));
     QCOMPARE(xdxfPlugin->search("1"), QString("one\n"));
 
-    QCOMPARE(xdxfPlugin->search("test"), QString("test1\n"));
+    QCOMPARE(xdxfPlugin->search("test"), QString("<pos>krowa</pos>test01\n"));
 }
 
 void XdxfTest::searchWordList() {