File fix-gnome-help-support.diff of Package kdelibs3

Overview Repositories Revisions Requests Users Attributes Meta

File fix-gnome-help-support.diff of Package kdelibs3 (Revision c9f8ffd6dfa7919353d0b2b8173d48f9)

Currently displaying revision c9f8ffd6dfa7919353d0b2b8173d48f9 , Show latest

--- kdoctools/kio_help.cpp
+++ kdoctools/kio_help.cpp
@@ -52,7 +52,26 @@
     // assemble the local search paths
     const QStringList localDoc = KGlobal::dirs()->resourceDirs("html");
 
+    kdDebug( 7119 ) << "Looking up help for: " << fname << endl;
+
+    QString path;
+    int slash = fname.findRev ('/');
+    if (slash == -1 || slash == 0) {
+      path = fname;
+      fname = "";
+    } else {
+      path = fname.left (slash);
+      fname = fname.right (fname.length() - slash);
+    }
+
     QStringList langs = KGlobal::locale()->languageList();
+    QStringList::ConstIterator lang;
+    for (lang = langs.begin(); lang != langs.end(); ++lang)
+        if ((*lang).left(2) == "en")
+	    search.append(QString("/opt/gnome/share/gnome/help/%1/C%2").arg(path).arg(fname));
+        else
+	    search.append(QString("/opt/gnome/share/gnome/help/%1/%2%3").arg(path).arg(*lang).arg(fname));
+
     langs.append( "en" );
     langs.remove( "C" );
 
@@ -68,7 +87,7 @@
     {
         QStringList::ConstIterator lang;
         for (lang = langs.begin(); lang != langs.end(); ++lang)
-            search.append(QString("%1%2/%3").arg(localDoc[id]).arg(*lang).arg(fname));
+            search.append(QString("%1%2/%3").arg(localDoc[id]).arg(*lang).arg(path + fname));
     }
 
     // try to locate the file
@@ -89,6 +108,15 @@
             if (info.exists() && info.isFile() && info.isReadable())
                 return *it;
         }
+
+        if ( ( *it ).right( 5 ) == ".html" )
+        {
+            QString file = (*it).left((*it).findRev('/')) + "/" + path + ".xml";
+            kdDebug( 7119 ) << "Looking for help in: " << file << endl;
+            info.setFile(file);
+            if (info.exists() && info.isFile() && info.isReadable())
+                return *it;
+        }
     }
 
 
@@ -108,7 +136,7 @@
     result = langLookup(path);
     if (result.isEmpty())
     {
-        result = langLookup(path+"/index.html");
+        result = langLookup(path + "/index.html");
         if (!result.isEmpty())
 	{
             KURL red( "help:/" );
@@ -203,12 +231,26 @@
       }
     } else {
         QString docbook_file = file.left(file.findRev('/')) + "/index.docbook";
+        int last_slash = file.findRev('/');
+        if (last_slash != -1 && last_slash != 0) {
+          int slash2 = file.findRev('/', last_slash -1);
+          if (slash2 != -1 && slash2 != 0) {
+	     int slash3 = file.findRev('/', slash2 - 1);
+	     if (slash3 != -1) {
+	       QString xml_file = file.left(file.findRev('/')) + "/" + file.mid(slash3 + 1, slash2 - (slash3 + 1)) + ".xml";
+	       kdDebug( 7119 ) << "xml_file " << xml_file << endl;
+	       QFileInfo fi(xml_file);
+	       if (fi.exists())
+	         docbook_file = xml_file;
+	     }
+          }
+        }
         if (!KStandardDirs::exists(file)) {
             file = docbook_file;
         } else {
             QFileInfo fi(file);
             if (fi.isDir()) {
-                file = file + "/index.docbook";
+                file = docbook_file;
             } else {
                 if ( file.right( 5 ) != ".html" || !compareTimeStamps( file, docbook_file ) ) {
                     get_file( target );
@@ -251,7 +293,11 @@
             mParsed = transform(file, locate("dtd", "customization/kde-chunk.xsl"));
             if ( !mParsed.isEmpty() ) {
                 infoMessage( i18n( "Saving to cache" ) );
-                QString cache = file.left( file.length() - 7 );
+		QString cache;
+		if (file.endsWith(".xml"))
+		    cache = file.left( file.length() - strlen ("xml") );
+		else
+		    cache = file.left( file.length() - strlen ("docbook") );
                 saveToCache( mParsed, locateLocal( "cache",
                                                         "kio_help" + cache +
                                                         "cache.bz2" ) );
--- kdoctools/xslt.cpp
+++ kdoctools/xslt.cpp
@@ -274,10 +274,16 @@
 QString lookForCache( const QString &filename )
 {
     kdDebug() << "lookForCache " << filename << endl;
-    assert( filename.endsWith( ".docbook" ) );
+    assert( filename.endsWith( ".docbook" ) || filename.endsWith( ".xml" ) );
     assert( filename.at( 0 ) == '/' );
 
-    QString cache = filename.left( filename.length() - 7 );
+    QString cache;
+
+    if (filename.endsWith( ".xml" ))
+      cache = filename.left( filename.length() - strlen ("xml") );
+    else
+      cache = filename.left( filename.length() - strlen ("docbook") );
+
     QString output;
     if ( readCache( filename, cache + "cache.bz2", output) )
         return output;

Places

File fix-gnome-help-support.diff of Package kdelibs3 (Revision c9f8ffd6dfa7919353d0b2b8173d48f9)

Places