Reapply fix for Strong x-ref

1 files changed, 46 insertions, 15 deletions

diff --git a/noncore/apps/dagger/mainwindow.cpp b/noncore/apps/dagger/mainwindow.cpp
index e886bd8..3dd9eff 100644
--- a/noncore/apps/dagger/mainwindow.cpp
+++ b/noncore/apps/dagger/mainwindow.cpp
@@ -10,48 +10,49 @@ This file is distributed in the hope that it will be useful, but WITHOUT ANY
 WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
 PARTICULAR PURPOSE. See the GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License along with this
 file; see the file COPYING. If not, write to the Free Software Foundation, Inc.,
 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 */
 
 #include "mainwindow.h"
 #include "navbar.h"
 #include "searchbar.h"
 #include "opentextdlg.h"
 #include "configuredlg.h"
 #include "textwidget.h"
 
 #include <opie2/odebug.h>
 
 #include <qpe/qcopenvelope_qws.h>
 #include <qpe/qpeapplication.h>
 #include <qpe/resource.h>
 
 #include <qaction.h>
 #include <qclipboard.h>
 #include <qmenubar.h>
+#include <qmessagebox.h>
 #include <qobjectlist.h>
 #include <qpopupmenu.h>
 #include <qtimer.h>
 #include <qtoolbar.h>
 
 #include <markupfiltmgr.h>
 
 MainWindow::MainWindow( QWidget *parent, const char *name, WFlags /*fl*/ )
     : QMainWindow( parent, name, WStyle_ContextHelp )
     , m_config( "dagger" )
     , m_tabs( this )
     , m_autoScrollTimer( this )
 {
     // Initialize sword library manager
     m_config.setGroup( "Sword" );
     m_modulePath = m_config.readEntry( "ModPath", "/usr/local/share/sword" );
     m_swordMgr = new sword::SWMgr( m_modulePath.latin1(), true,
                                    new sword::MarkupFilterMgr( sword::FMT_HTMLHREF ) );
 
     // Retrieve list of available Sword module options (e.g. footnotes, Strong's numbers, etc.)
     sword::StringList swordOpts = m_swordMgr->getGlobalOptions();
     for ( sword::StringList::iterator it = swordOpts.begin(); it != swordOpts.end(); it++ )
         m_actionSwordOpts.append( new QAction( (*it).c_str(), QString::null, 0, this, 0 ) );
     m_actionSwordOpts.sort();
@@ -666,48 +667,78 @@ void MainWindow::slotNavAutoScroll( bool enabled )
 }
 
 void MainWindow::slotNavScrollRateChanged( int newRate )
 {
     if ( m_autoScrollTimer.isActive() )
     {
         m_autoScrollTimer.stop();
         m_autoScrollTimer.start( newRate * 100 );
     }
 }
 
 void MainWindow::slotSearchResultClicked( const QString &key )
 {
     TextWidget *text = reinterpret_cast<TextWidget *>(m_tabs.currentWidget());
     if ( text )
     {
         text->setKey( key );
         setCaption( QString( "%1 - Dagger" ).arg( text->getFullKey() ) );
         m_navToolbar->setKey( text->getAbbrevKey() );
     }
 }
 
 void MainWindow::slotTextRefClicked( const QString &ref )
 {
+//printf( "Ref clicked: '%s'\n", ref.latin1() );
+/*
+Ref clicked: 'type=Strongs value=G3482'
+Ref clicked: 'type=Strongs value=H07225'
+Ref clicked: 'type=morph class=x-Robinson:N-PRI value=N-PRI'
+Ref clicked: 'type=morph class=x-StrongsMorph:TH8804 value=TH8804'
+*/
     //owarn << "Reference: " << ref << oendl;
     if ( !ref.isNull() )
     {
         TextWidget *text = reinterpret_cast<TextWidget *>(m_tabs.currentWidget());
         if ( text )
         {
-            QString module;
-            QString key( ref );
-            key.remove( 0, 2 );
-
-            QChar book = ref.at( 1 );
-            // TODO- this is ugly, need better way to determine type of reference
-            //       take a look at SWModule::getRawEntry()
-            int keyValue = key.toInt();
-            if ( book == 'H' && keyValue <= 8674 )
-                module = "StrongsHebrew";
-            else if ( book == 'G' && keyValue <= 5624 )
-                module = "StrongsGreek";
-
-            if ( !module.isEmpty() )
-                openModule( module, key );
+            // Parse type
+            int pos = ref.find( "type=", 0, false ) + 5;
+            QString typeStr = ref.mid( pos, ref.find( ' ', pos ) - pos );
+            
+            // Parse class (for morph. only)
+            QString classStr;
+            if ( typeStr == "morph" )
+            {
+                pos = ref.find( "class=", 0, false ) + 5;
+                QString classStr = ref.mid( pos, ref.find( ' ', pos ) - pos );
+                
+                // TODO - need to strip 'x-' from beginning and ':key' at end?
+            }
+            
+            // Parse value
+            pos = ref.find( "value=", 0, false ) + 6;
+            QString valueStr = ref.mid( pos, ref.find( ' ', pos ) - pos );
+            
+            if ( typeStr == "Strongs" )
+            {
+                //Determine if is a Hebrew or Greek reference
+                QString module;
+                if ( valueStr.at( 0 ) == 'H' )
+                    module = "StrongsHebrew";
+                else
+                    module = "StrongsGreek";
+                
+                // Get key
+                QString key( valueStr );
+                key.remove( 0, 1 );
+                // Open reference
+                 openModule( module, key );
+            }
+            else if ( typeStr == "morph" )
+            {
+                QMessageBox::information( this, tr( "Morphological Tags" ),
+                       tr( "Morphological tag cross-referencing not implemented yet." ) );
+            }
         }
     }
 }