[Tora-cvs] SF.net SVN: tora:[3873] trunk/tora

[<tom...@us...>]

Revision: 3873
          http://tora.svn.sourceforge.net/tora/?rev=3873&view=rev
Author:   tomasstraupis
Date:     2011-01-23 22:41:15 +0000 (Sun, 23 Jan 2011)

Log Message:
-----------
Fix searching in Oracle manuals. Add note in documentation about adding Oracle11g manuals as additional help.

Modified Paths:
--------------
    trunk/tora/doc/help/additionalhelp.html
    trunk/tora/doc/help/additionalhelp.texi
    trunk/tora/src/tohelp.cpp

Modified: trunk/tora/doc/help/additionalhelp.html
===================================================================
--- trunk/tora/doc/help/additionalhelp.html	2011-01-20 19:52:18 UTC (rev 3872)
+++ trunk/tora/doc/help/additionalhelp.html	2011-01-23 22:41:15 UTC (rev 3873)
@@ -46,7 +46,7 @@
      <dl>
 <dt><strong>Remove path</strong><dd>This will remove the currently selected manual from the list.
 
-     <br><dt><strong>Oracle Manuals</strong><dd>This is a quick way to add a collection of manuals. When you select this button a dialog will pop up and ask you for a filename. In Oracle 8 this should be the index page that contains the links to the manuals. Observe that this is not the page which links to the different book categories. In Oracle 9i you should point it to the docindex.htm file in the base directory of the documentation. If successful all the manuals available on the page is added to the list of manuals.
+     <br><dt><strong>Oracle Manuals</strong><dd>This is a quick way to add a collection of manuals. When you select this button a dialog will pop up and ask you for a filename. This should be the page that contains the links to the manuals. Observe that this is not the page which links to the different book categories. In Oracle 9i you should point it to the docindex.htm file in the base directory of the documentation. In Oracle 11g you should point to <i>nav/portal_3.htm</i>. If successful all the manuals available on the page are added to the list of manuals.
 
      <br><dt><strong>Add path</strong><dd>Add a manual to the list of manuals. This pop up a dialog asking for the name of the manual and the location of the manuals table of contents HTML file (toc.html).
 

Modified: trunk/tora/doc/help/additionalhelp.texi
===================================================================
--- trunk/tora/doc/help/additionalhelp.texi	2011-01-20 19:52:18 UTC (rev 3872)
+++ trunk/tora/doc/help/additionalhelp.texi	2011-01-23 22:41:15 UTC (rev 3873)
@@ -13,7 +13,7 @@
 This will remove the currently selected manual from the list.
 
 @item @strong{Oracle Manuals}
-This is a quick way to add a collection of manuals. When you select this button a dialog will pop up and ask you for a filename. In Oracle 8 this should be the index page that contains the links to the manuals. Observe that this is not the page which links to the different book categories. In Oracle 9i you should point it to the docindex.htm file in the base directory of the documentation. If successful all the manuals available on the page is added to the list of manuals.
+This is a quick way to add a collection of manuals. When you select this button a dialog will pop up and ask you for a filename. This should be the page that contains the links to the manuals. Observe that this is not the page which links to the different book categories. In Oracle 9i you should point it to the docindex.htm file in the base directory of the documentation. In Oracle 11g you should point to @i{nav/portal_3.htm}. If successful all the manuals available on the page are added to the list of manuals.
 
 @item @strong{Add path}
 Add a manual to the list of manuals. This pop up a dialog asking for the name of the manual and the location of the manuals table of contents HTML file (toc.html).

Modified: trunk/tora/src/tohelp.cpp
===================================================================
--- trunk/tora/src/tohelp.cpp	2011-01-20 19:52:18 UTC (rev 3872)
+++ trunk/tora/src/tohelp.cpp	2011-01-23 22:41:15 UTC (rev 3873)
@@ -478,7 +478,7 @@
     disconnect(Help, SIGNAL(textChanged(void)),
                this, SLOT(removeSelection(void)));
 
-    if (!item->text(2).isEmpty())
+    if (item && !item->text(2).isEmpty())
     {
         if (item->text(2).startsWith("qrc:"))
             Help->setSource(item->text(2));
@@ -518,7 +518,33 @@
         {
             QString path = toHelp::path(parent->text(2));
             QString filename = path;
-            filename.append(QString::fromLatin1("toc.html"));
+            /* We have to find file with index information. This file should be called
+             * either toc.html or index.htm. Note that we cannot use QFile::exists()
+             * to check existance of file in qt resources so that case is hardcoded.
+             */
+            if (filename.startsWith("qrc:"))
+                filename.append(QString::fromLatin1("toc.html"));
+            else
+            {
+                QFile file;
+                // Oracle 11g has an index.htm file with manual index
+                file.setFileName(filename + "index.htm");
+                if (file.exists())
+                    filename.append(QString::fromLatin1("index.htm"));
+                else
+                {
+                    // toc.html is here for backwards compatibility (say Oracle 9i)
+                    // Can probably be removed later (written on 2011-01-23)
+                    file.setFileName(filename + "toc.html");
+                    if (file.exists())
+                        filename.append(QString::fromLatin1("toc.html"));
+                    else
+                    {
+                        // If neither toc.html nor index.htm was found in manual directory - do nothing
+                        continue;
+                    }
+                }
+            }
 
             try
             {


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.