Enable the readers again.

Now only the kvtml-1 reader/writer need to be ported.

svn path=/branches/work/kdeedu_parley/libkdeedu/; revision=757569

diff --git a/keduvocdocument/CMakeLists.txt b/keduvocdocument/CMakeLists.txt
index 46c3050a4ecf70741790f3a9de0e6ad8a98ddc22..8fd2e3571b2bd38918fc8be939cf2c5bb068ec79 100644 (file)
--- a/keduvocdocument/CMakeLists.txt
+++ b/keduvocdocument/CMakeLists.txt
@@ -14,7 +14,6 @@ keduvocdocument.cpp
    keduvocconjugation.cpp
    keduvocpersonalpronoun.cpp
    keduvocdeclination.cpp
-   #keduvocmultiplechoice.cpp
    keduvocwordtype.cpp
    keduvockvtmlcompability.cpp
    #keduvockvtmlreader.cpp
@@ -24,9 +23,9 @@ keduvocdocument.cpp
    keduvoccsvreader.cpp
    keduvoccsvwriter.cpp
    keduvocpaukerreader.cpp
-   #keduvocvokabelnreader.cpp
-   #keduvocwqlreader.cpp
-   #keduvocxdxfreader.cpp
+   keduvocvokabelnreader.cpp
+   keduvocwqlreader.cpp
+   keduvocxdxfreader.cpp
    sharedkvtmlfiles.cpp )
 
 kde4_add_library(keduvocdocument SHARED ${keduvocdocument_LIB_SRCS})

diff --git a/keduvocdocument/keduvockvtmlreader.cpp b/keduvocdocument/keduvockvtmlreader.cpp
index e7a60a8981ee15a9abb04443b3deb25f31ccff4a..4dc27977acb7f78ec08790d868fe6a42268f5caa 100644 (file)
--- a/keduvocdocument/keduvockvtmlreader.cpp
+++ b/keduvocdocument/keduvockvtmlreader.cpp
@@ -205,13 +205,6 @@ bool KEduVocKvtmlReader::readLesson( QDomElement &domElementParent )
     QDomAttr attribute;
     QDomElement currentElement;
 
-    //-------------------------------------------------------------------------
-    // Attributes
-    //-------------------------------------------------------------------------
-
-    attribute = domElementParent.attributeNode( KV_SIZEHINT );
-    if ( !attribute.isNull() )
-        m_doc->setSizeHint( -1, attribute.value().toInt() );
 
     //-------------------------------------------------------------------------
     // Children

diff --git a/keduvocdocument/keduvoctranslation.h b/keduvocdocument/keduvoctranslation.h
index ce3befd15cd139a1b6aa55575b3ce38c1e04be37..a57a127314308a8c6e0ff2c1c5558deaffc40944 100644 (file)
--- a/keduvocdocument/keduvoctranslation.h
+++ b/keduvocdocument/keduvoctranslation.h
@@ -20,7 +20,6 @@
 #include "libkeduvocdocument_export.h"
 #include "keduvocgrammar.h"
 #include "keduvocconjugation.h"
-// #include "keduvocmultiplechoice.h"
 #include <KDE/KUrl>
 #include <QtCore/QString>
 

diff --git a/keduvocdocument/keduvocvokabelnreader.cpp b/keduvocdocument/keduvocvokabelnreader.cpp
index 83dde8846047ba6b330f2f655c2eaa2ac278be33..3a6470e726b01473ade7be6356dadea97043101e 100644 (file)
--- a/keduvocdocument/keduvocvokabelnreader.cpp
+++ b/keduvocdocument/keduvocvokabelnreader.cpp
@@ -58,13 +58,12 @@ bool KEduVocVokabelnReader::readDoc( KEduVocDocument *doc )
     QString expression;
     QString original;
     QString translation;
-    QString lessonDescr;
     QString temp;
     QString comment;
 
     int i;
     int wordCount;
-    int lesson;
+    int lessonNumber;
 
     int lines = 10000;
 
@@ -119,6 +118,7 @@ bool KEduVocVokabelnReader::readDoc( KEduVocDocument *doc )
         inputStream.readLine();
     }
 
+
     for ( i = 0; i < wordCount - 1; i++ ) {
         int c = 0;
         expression.clear();
@@ -135,16 +135,18 @@ bool KEduVocVokabelnReader::readDoc( KEduVocDocument *doc )
         words = expression.split( "\"," );
         original = words[0].mid( 1 );
         translation = words[1].mid( 1 );
-        lesson = words[2].toInt() - 1;
+        lessonNumber = words[2].toInt() - 1;
+
+        while(m_doc->lesson()->childContainerCount() < lessonNumber) {
+            KEduVocLesson* lesson = new KEduVocLesson(i18n("Lesson %1", lessonNumber), m_doc->lesson());
+            m_doc->lesson()->appendChildContainer(lesson);
+        }
 
-        KEduVocExpression kve;
-        kve.setTranslation( 0, original );
-        kve.setTranslation( 1, translation );
-        kve.translation( 1 ).gradeFrom( 0 ).setGrade( 0 );
-        kve.translation( 0 ).gradeFrom( 1 ).setGrade( 0 );
-        kve.setLesson( lesson );
+        KEduVocExpression* kve = new KEduVocExpression;
+        kve->setTranslation( 0, original );
+        kve->setTranslation( 1, translation );
 
-        m_doc->appendEntry( &kve );
+        static_cast<KEduVocLesson*>(m_doc->lesson()->childContainer(lessonNumber))->addEntry(kve);
 
         inputStream.readLine();
         inputStream.readLine();
@@ -155,12 +157,12 @@ bool KEduVocVokabelnReader::readDoc( KEduVocDocument *doc )
     inputStream.readLine();
 
     for ( int i = 0; !inputStream.atEnd() && i < lines; i++ ) {
-        lessonDescr = inputStream.readLine();
+        QString lessonDescr = inputStream.readLine();
         lessonDescr = lessonDescr.mid( 1, lessonDescr.length() - 2 );
-        if ( !lessonDescr.isEmpty() )
-            m_doc->appendLesson( lessonDescr );
-        else
+        m_doc->lesson()->childContainer(i)->setName(lessonDescr);
+        if ( lessonDescr.isEmpty() ) {
             break;
+        }
         inputStream.readLine();
     }
 

diff --git a/keduvocdocument/keduvocwqlreader.cpp b/keduvocdocument/keduvocwqlreader.cpp
index b0131daea58ea6ee67d1e4447ccdd51d62387fba..8f225ed9b7eb5aa42a64dd41ca5c830642e91997 100644 (file)
--- a/keduvocdocument/keduvocwqlreader.cpp
+++ b/keduvocdocument/keduvocwqlreader.cpp
@@ -102,12 +102,12 @@ bool KEduVocWqlReader::readDoc( KEduVocDocument *doc )
     s = inputStream.readLine();
     p = s.indexOf( "=", 0 );
     s = s.right( s.length() - ( p + 1 ) );
-    m_doc->setSizeHint( 0, s.toInt() );
+//     m_doc->setSizeHint( 0, s.toInt() );
 
     s = inputStream.readLine();
     p = s.indexOf( "=", 0 );
     s = s.right( s.length() - ( p + 1 ) );
-    m_doc->setSizeHint( 1, s.toInt() );
+//     m_doc->setSizeHint( 1, s.toInt() );
 
     /* TODO
       s = inputStream.readLine();
@@ -163,7 +163,7 @@ bool KEduVocWqlReader::readDoc( KEduVocDocument *doc )
 
         KEduVocExpression expr = KEduVocExpression( s );
         expr.setTranslation( 1, b );
-        m_doc->appendEntry( &expr );
+        m_doc->lesson()->addEntry( &expr );
     }
     return true;
 }

diff --git a/keduvocdocument/keduvocxdxfreader.cpp b/keduvocdocument/keduvocxdxfreader.cpp
index f3b5243a073a69702d8b64997042e97a37b9cb35..4a1497fa0800fd8738f4613e731d16c7c503e57a 100644 (file)
--- a/keduvocdocument/keduvocxdxfreader.cpp
+++ b/keduvocdocument/keduvocxdxfreader.cpp
@@ -115,5 +115,5 @@ void KEduVocXdxfReader::readEntry()
 
     KEduVocExpression expr = KEduVocExpression( front );
     expr.setTranslation( 1, back );
-    m_doc->appendEntry( &expr );
+    m_doc->lesson()->addEntry( &expr );
 }