Make search for only complete words working. Removing qDebug-lines. Fix a

bug (the seperator has not been loaded).
author: cniehaus <cniehaus> 2003-01-12 16:16:13 (UTC)
committer: cniehaus <cniehaus> 2003-01-12 16:16:13 (UTC)
commit: aa4f80fdc2d78bfe1c1d4cb8ec1d852115d00fc7 (patch) (unidiff)
tree: d102e440196aea471b3ed8d0357934a1a9f2e385
parent: 6e7d82135cdab0190739d2ddf84cd2211d18d00b (diff)
download: opie-aa4f80fdc2d78bfe1c1d4cb8ec1d852115d00fc7.zip
opie-aa4f80fdc2d78bfe1c1d4cb8ec1d852115d00fc7.tar.gz
opie-aa4f80fdc2d78bfe1c1d4cb8ec1d852115d00fc7.tar.bz2
3 files changed, 13 insertions, 23 deletions
diff --git a/noncore/apps/odict/dingwidget.cpp b/noncore/apps/odict/dingwidget.cpp
index 5b5d731..cfef84d 100644
--- a/noncore/apps/odict/dingwidget.cpp
+++ b/noncore/apps/odict/dingwidget.cpp
@@ -21,66 +21,58 @@
 #include <qhbox.h>
 #include <qlabel.h>
 #include <qpushbutton.h>
 #include <qlineedit.h>
 #include <qmainwindow.h>
 #include <qstring.h>
 #include <qtextstream.h>
 #include <qstringlist.h>
 #include <qregexp.h>
 #include <qtextbrowser.h>
 #include <stdlib.h> // for getenv
 DingWidget::DingWidget( )
 {
        methodname = QString::null;
-        trenner = "::";//QString::null;
+        trenner = QString::null;
        lines = 0L;
-        loadValues();
-        //X qDebug( topbrowser );
-        //X qDebug( top );
-//X 
-        //X topbrowser = "blahbalh";
-        //X 
-        //X qDebug( topbrowser );
-        //X qDebug( top );
 }
 void DingWidget::loadDict( QString name )
 {
        qDebug( "MUSS ich wirklich aufgerufen werder? schreit loadDict" );
        qDebug( "Starte mit dem loadedDict(...)" );
        dictName = name;
        qDebug( "bin in loadedDict() und lade das Dict:" );
        qDebug( dictName );
          QString opie_dir = getenv("OPIEDIR");
        QFile file( opie_dir+"/noncore/apps/odict/eng_ita.dic" );
        //FIXME:this should of course be not hardcoded ;)
        
        if(  file.open(  IO_ReadOnly ) )
        {
                QTextStream stream(  &file );
                while ( !stream.eof() )
                {
                        lines.append(  stream.readLine() );
                }
                file.close();
        }
        qDebug( "loadedDict(...) ist beended" );
+        loadValues();
 }
 QString DingWidget::loadedDict()
 { 
        qDebug( dictName );
        qDebug( "^ ^ ^ ^ ^ ^ ^ war der dictName" );
        return dictName;
 }
 void DingWidget::setCaseSensitive( bool caseS )
 {
        isCaseSensitive = caseS;
 }
 void DingWidget::setDict( QString dict )
 {
@@ -95,58 +87,60 @@ void DingWidget::setCompleteWord( bool cword )
 void DingWidget::setQueryWord( QString qword )
 {
        queryword = qword;
 }
 BroswerContent DingWidget::setText( QString word )
 {
        queryword = word;
        qDebug( queryword );
        qDebug( "^ ^ ^ ^ ^ ^ ^ war das gesuchte Word");
        return parseInfo();
 }
 void DingWidget::loadValues()
 {
        Config cfg(  "odict" );
-        cfg.setGroup( "Method_"+methodname );
+        cfg.setGroup( "Method_" + methodname );
-        //trenner = cfg.readEntry( "Seperator" );
+        trenner = cfg.readEntry( "Seperator" );
 }
 BroswerContent DingWidget::parseInfo()
 {
+        if ( isCompleteWord ) queryword = " " + queryword + " ";
        QStringList search = lines.grep( queryword , isCaseSensitive );
         QString current;
         QString left;
         QString right;
-        QString html_header      = "<html><table>";
-        QString html_footer      = "</table></html>";
-        QString html_table_left  = "<tr><td width='50'>";
-        QString html_table_sep   = "</td><td>";
-        QString html_table_right = "</td></tr>";
        QRegExp reg_div( trenner );
        QRegExp reg_word( queryword );
        reg_word.setCaseSensitive( isCaseSensitive );
        QStringList toplist, bottomlist;
        QString substitute = "<strong>"+queryword+"</strong>";
        /*             Dieser Block ist von Patrik. Ich versuche einen neuen
         *             Ansatz. Zum einen ist HTML schei�e an dieser Stelle und 
         *             zum andern funktioniert der Code nicht so wie er sollte.
        QString substitute = "<a href=''>"+queryword+"</a>";
+        
+        QString html_header      = "<html><table>";
+        QString html_footer      = "</table></html>";
+        QString html_table_left  = "<tr><td width='50'>";
+        QString html_table_sep   = "</td><td>";
+        QString html_table_right = "</td></tr>";
         
        for( QStringList::Iterator it = search.begin() ; it != search.end() ; ++it )
        {
                current = *it;
                left = current.left( current.find(reg_div) );
                right = current.right( current.length() - current.find(reg_div) - 1 );
                if ( left.contains( reg_word ) )
                {
                  left.replace( queryword, substitute );
                  toplist.append( html_table_left + left + html_table_sep + right + html_table_right );
                }
                else
                {
                  right.replace( reg_word, substitute );
                  bottomlist.append( html_table_left + right + html_table_sep + left + html_table_right );
                }
diff --git a/noncore/apps/odict/dingwidget.h b/noncore/apps/odict/dingwidget.h
index ba37009..74f40c9 100644
--- a/noncore/apps/odict/dingwidget.h
+++ b/noncore/apps/odict/dingwidget.h
@@ -16,32 +16,32 @@ struct BroswerContent
        QString bottom;
 };
 class DingWidget
 {
    public:
                DingWidget();
                BroswerContent setText( QString );
                QStringList lines;
                void setCaseSensitive( bool );
                void setCompleteWord( bool );
                void loadDict( QString );
                QString loadedDict();
                void setQueryWord( QString );
                void setDict( QString );
+                void loadValues();
        private:
                BroswerContent parseInfo();
                BroswerContent s_strings;
                bool isCompleteWord;
                bool isCaseSensitive;
                QString dictName;
                
                QString search_word;
-                void loadValues();
                QString queryword;
                QString methodname;
                QString trenner;
 };
diff --git a/noncore/apps/odict/odict.cpp b/noncore/apps/odict/odict.cpp
index 42604ee..78c3f90 100644
--- a/noncore/apps/odict/odict.cpp
+++ b/noncore/apps/odict/odict.cpp
@@ -44,32 +44,33 @@ ODict::ODict() : QMainWindow()
        vbox = new QVBox( this );
        setCaption( tr( "OPIE-Dictionary" ) );
        setupMenus();
        
        QHBox *hbox = new QHBox( vbox );
        QLabel* query_label = new QLabel( tr( "Query:" ) , hbox ); query_label->show();
        query_le = new QLineEdit( hbox );
        query_co = new QComboBox( hbox );
        connect( query_co , SIGNAL( activated(int) ), this, SLOT( slotMethodChanged(int) ) );
        ok_button = new QPushButton( tr( "&Ok" ), hbox );
        connect( ok_button, SIGNAL( released() ), this, SLOT( slotStartQuery() ) );
        browser_top = new QTextBrowser( vbox );
        browser_bottom = new QTextBrowser( vbox );
        ding = new DingWidget();
+        ding->loadValues();
        loadConfig();
        setCentralWidget( vbox );
 }
 void ODict::loadConfig()
 {
        Config cfg ( "odict" );
        cfg.setGroup( "generalsettings" );
        errorTol = cfg.readEntry( "errtol" ).toInt();
        casesens = cfg.readEntry( "casesens" ).toInt();
        regexp = cfg.readEntry( "regexp" ).toInt();
        completewords = cfg.readEntry( "completewords" ).toInt();
        QStringList groupListCfg = cfg.groupList().grep( "Method_" );
        query_co->clear();
@@ -97,45 +98,40 @@ void ODict::slotDisplayAbout()
        QMessageBox::about(  this, tr( "About ODict" ), tr( "OPIE-Dictionary ODict \n (c) 2002, 2003 Carsten  Niehaus \n cniehaus@handhelds.org \n Version 20030111" ) );
 }
 void ODict::slotStartQuery()
 {
        QString querystring = query_le->text();
        //X qDebug("opening dict >%s< for >%s<", activated_name.latin1(),querystring.latin1());
        //X if (querystring.isEmpty()){
        //X     qWarning("empty querystring");
        //X     return;
        //X }
        //X if (!activated_name || activated_name.isEmpty())
        //X     QMessageBox::warning(this,tr("No Dictionary"),tr("Please choose a dictonary") );
        //X else
        //X {
-                if ( casesens ) qDebug( "casesens = TRUE" );
-                else qDebug( "casesens = FALSE" );
-                
                ding->setCaseSensitive( casesens ); 
                ding->setCompleteWord( completewords ); 
                ding->setDict( activated_name );
                
                if ( activated_name != ding->loadedDict() )
                {
-                        qDebug( "ComboBox ge�ndert" );
                        ding->loadDict(activated_name);
                }
-                else qDebug( "ComboBox war GLEICH" );
                
                BroswerContent test = ding->setText( querystring );
                browser_top->setText( test.top );
                browser_bottom->setText( test.bottom );
                
                qDebug( "Text sollte gesetzt sein..." );
        //X }
 }
 void ODict::slotSetErrorcount( int count )
 {
        errorTol = count;
 }
author	cniehaus <cniehaus>	2003-01-12 16:16:13 (UTC)
committer	cniehaus <cniehaus>	2003-01-12 16:16:13 (UTC)
commit	aa4f80fdc2d78bfe1c1d4cb8ec1d852115d00fc7 (patch) (unidiff)
tree	d102e440196aea471b3ed8d0357934a1a9f2e385
parent	6e7d82135cdab0190739d2ddf84cd2211d18d00b (diff)
download	opie-aa4f80fdc2d78bfe1c1d4cb8ec1d852115d00fc7.zip opie-aa4f80fdc2d78bfe1c1d4cb8ec1d852115d00fc7.tar.gz opie-aa4f80fdc2d78bfe1c1d4cb8ec1d852115d00fc7.tar.bz2